修改微信基础数据

stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxUserInfo.java

@@ -1,5 +1,6 @@
 package com.stdiet.custom.domain;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.stdiet.common.annotation.Excel;
 import lombok.Data;
 
@@ -19,8 +20,11 @@ public class SysWxUserInfo {
      */
     private String openid;
 
+    @JsonIgnore
     private Long cusId;
 
+    private String customerId;
+
     /**
      * 昵称
      */
@@ -63,6 +67,8 @@ public class SysWxUserInfo {
     @Excel(name = "省份")
     private String province;
 
+    private String language;
+
     /**
      * 国家
      */

stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCustomerServiceImpl.java

@@ -69,7 +69,10 @@ public class SysCustomerServiceImpl implements ISysCustomerService {
     @Override
     public int insertSysCustomer(SysCustomer sysCustomer) {
         sysCustomer.setCreateTime(DateUtils.getNowDate());
-        return sysCustomerMapper.insertSysCustomer(sysCustomer);
+        sysCustomerMapper.insertSysCustomer(sysCustomer);
+        SysCustomer mCustomer = new SysCustomer();
+        mCustomer.setId(sysCustomer.getId());
+        return sysCustomerMapper.updateSysCustomer(mCustomer);
     }
 
     /**

stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java

@@ -279,6 +279,9 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService {
                 planStartDate = serverEndDate;
                 breakFlag = false;
             }
+            if(planEndDate == planStartDate && StringUtils.isNotEmpty(pauseResult)) {
+                continue;
+            }
             //暂停日期
             sysRecipesPlan.setPauseDate(pauseResult[3]);
             sysRecipesPlan.setStartDate(DateUtils.localDateToDate(planStartDate));