修改微信基础数据

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));

stdiet-custom/src/main/resources/mapper/custom/SysCustomerMapper.xml

@@ -129,6 +129,7 @@
     <update id="updateSysCustomer" parameterType="SysCustomer">
         update sys_customer
         <trim prefix="SET" suffixOverrides=",">
+            <if test="id != null">out_id = md5(#{id}),</if>
             <if test="name != null">name = #{name},</if>
             <if test="phone != null">phone = #{phone},</if>
             <if test="fansTime != null">fans_time = #{fansTime},</if>

stdiet-custom/src/main/resources/mapper/custom/SysCustomerPhysicalSignsMapper.xml

@@ -80,6 +80,7 @@
         insert into sys_customer_physical_signs
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="customerId != null">customer_id,</if>
+            <if test="customerId != null">out_id,</if>
             <if test="sex != null">sex,</if>
             <if test="age != null">age,</if>
             <if test="tall != null">tall,</if>
@@ -117,6 +118,7 @@
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="customerId != null">#{customerId},</if>
+            <if test="customerId != null">md5#{customerId},</if>
             <if test="sex != null">#{sex},</if>
             <if test="age != null">#{age},</if>
             <if test="tall != null">#{tall},</if>
@@ -158,6 +160,7 @@
         update sys_customer_physical_signs
         <trim prefix="SET" suffixOverrides=",">
             <if test="customerId != null">customer_id = #{customerId},</if>
+            <if test="customerId != null">out_id = md5(#{customerId}),</if>
             <if test="sex != null">sex = #{sex},</if>
             <if test="age != null">age = #{age},</if>
             <if test="tall != null">tall = #{tall},</if>

stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml

@@ -206,6 +206,7 @@
             <if test="orderId != null">order_id,</if>
             <if test="customer != null and customer != ''">customer,</if>
             <if test="cusId != null">cus_id,</if>
+            <if test="cusId != null">out_id,</if>
             <if test="phone != null">phone,</if>
             <if test="payTypeId != null">pay_type_id,</if>
             <if test="reviewStatus != null">review_status,</if>
@@ -248,6 +249,7 @@
             <if test="orderId != null">#{orderId},</if>
             <if test="customer != null and customer != ''">#{customer},</if>
             <if test="cusId != null">#{cusId},</if>
+            <if test="cusId != null">md5(#{cusId}),</if>
             <if test="phone != null">#{phone},</if>
             <if test="payTypeId != null">#{payTypeId},</if>
             <if test="reviewStatus != null">#{reviewStatus},</if>

stdiet-custom/src/main/resources/mapper/custom/SysWxUserInfoMapper.xml

@@ -7,6 +7,7 @@
     <resultMap type="SysWxUserInfo" id="SysWxUserInfoResult">
         <result property="openid" column="openid"/>
         <result property="cusId" column="cus_id"/>
+        <result property="customerId" column="out_id"/>
         <result property="nickName" column="nick_name"/>
         <result property="appid" column="appid"/>
         <result property="phone" column="phone"/>
@@ -20,6 +21,7 @@
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="remark" column="remark"/>
+        <result property="language" column="language"/>
     </resultMap>
 
     <sql id="selectSysWxUserInfoVo">
@@ -56,6 +58,7 @@
             <if test="nickName != null">nick_name,</if>
             <if test="appid != null">appid,</if>
             <if test="cusId != null">cus_id,</if>
+            <if test="cusId != null">out_id,</if>
             <if test="phone != null">phone,</if>
             <if test="avatarUrl != null">avatar_url,</if>
             <if test="sex != null">sex,</if>
@@ -67,12 +70,14 @@
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
+            <if test="language != null">language,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="openid != null">#{openid},</if>
             <if test="nickName != null">#{nickName},</if>
             <if test="appid != null">#{appid},</if>
             <if test="cusId != null">#{cusId},</if>
+            <if test="cusId != null">md5(#{cusId}),</if>
             <if test="phone != null">#{phone},</if>
             <if test="avatarUrl != null">#{avatarUrl},</if>
             <if test="sex != null">#{sex},</if>
@@ -84,6 +89,7 @@
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="language != null">#{language},</if>
         </trim>
     </insert>
 
@@ -93,6 +99,7 @@
             <if test="nickName != null">nick_name = #{nickName},</if>
             <if test="appid != null">appid = #{appid},</if>
             <if test="cusId != null">cus_id = #{cusId},</if>
+            <if test="cusId != null">out_id = md5(#{cusId}),</if>
             <if test="phone != null">phone = #{phone},</if>
             <if test="avatarUrl != null">avatar_url = #{avatarUrl},</if>
             <if test="sex != null">sex = #{sex},</if>
@@ -104,6 +111,7 @@
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="language != null">language = #{language},</if>
         </trim>
         where openid = #{openid}
     </update>