合并

stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysOrderNutritionistReplaceRecordController.java

@@ -111,12 +111,14 @@ public class SysOrderNutritionistReplaceRecordController extends BaseController
             return AjaxResult.error("开始时间不能小于"+ DateUtils.dateTime(sysOrder.getCommissStartTime()));
         }
         //更换的售后或营养师不能与原订单一致
-        if(sysOrderNutritionistReplaceRecord.getNutritionistId() != null && sysOrder.getNutritionistId().longValue() == sysOrderNutritionistReplaceRecord.getNutritionistId().longValue()){
+//        if(sysOrderNutritionistReplaceRecord.getNutritionistId() != null && sysOrder.getNutritionistId().longValue() == sysOrderNutritionistReplaceRecord.getNutritionistId().longValue()){
-            return AjaxResult.error("更换的营养师与原订单营养师不能相同");
+//            return AjaxResult.error("更换的营养师与原订单营养师不能相同");
-        }
+//        }
-        if(sysOrderNutritionistReplaceRecord.getAfterSaleId() != null && sysOrder.getAfterSaleId().longValue() == sysOrderNutritionistReplaceRecord.getAfterSaleId().longValue()){
+
-            return AjaxResult.error("更换的售后与原订单售后不能相同");
+//        if(sysOrderNutritionistReplaceRecord.getAfterSaleId() != null && sysOrder.getAfterSaleId().longValue() == sysOrderNutritionistReplaceRecord.getAfterSaleId().longValue()){
-        }
+//            return AjaxResult.error("更换的售后与原订单售后不能相同");
+//        }
+
         //体验单、二开售后提成单都不支持更换营养师和售后
         if(sysOrder.getAfterSaleCommissOrder().intValue() == 1 || "2".equals(sysOrder.getOrderType())){
             return AjaxResult.error("二开提成单、体验单不支持更换营养师、售后");

stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java

@@ -2,12 +2,9 @@ package com.stdiet.web.controller.custom;
 
 import com.aliyun.vod20170321.models.GetPlayInfoResponseBody;
 import com.aliyun.vod20170321.models.GetVideoInfoResponseBody;
-import com.aliyun.vod20170321.models.GetVideoListResponseBody;
-import com.itextpdf.io.util.DateTimeUtil;
 import com.stdiet.common.core.controller.BaseController;
 import com.stdiet.common.core.domain.AjaxResult;
 import com.stdiet.common.core.page.TableDataInfo;
-import com.stdiet.common.enums.BusinessType;
 import com.stdiet.common.exception.file.FileNameLengthLimitExceededException;
 import com.stdiet.common.utils.AliyunVideoUtils;
 import com.stdiet.common.utils.DateUtils;
@@ -22,9 +19,7 @@ import com.stdiet.custom.dto.response.MessageNoticeResponse;
 import com.stdiet.custom.dto.response.NutritionalVideoResponse;
 import com.stdiet.custom.page.WxLogInfo;
 import com.stdiet.custom.service.*;
-import org.aspectj.weaver.loadtime.Aj;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -40,23 +35,21 @@ import java.util.*;
 public class WechatAppletController extends BaseController {
 
 
+    public static final String[] imageName = {"breakfastImages", "lunchImages", "dinnerImages", "extraMealImages", "bodyImages"};
     @Autowired
     private ISysCustomerCaseService sysCustomerCaseService;
-
     @Autowired
     private ISysWxUserLogService sysWxUserLogService;
-
     @Autowired
     private ISysWxUserInfoService sysWxUserInfoService;
-
     @Autowired
     private ISysOrderService sysOrderService;
-
     @Autowired
     private ISysNutritionQuestionService sysNutritionQuestionService;
-
     @Autowired
     private ISysAskNutritionQuestionService sysAskNutritionQuestionService;
+    @Autowired
+    private ISysCustomerService iSysCustomerService;
 
     @Autowired
     private ISysMessageNoticeService sysMessageNoticeService;
@@ -71,8 +64,7 @@ public class WechatAppletController extends BaseController {
      * 查询微信小程序中展示的客户案例
      */
     @GetMapping("/caseList")
-    public TableDataInfo caseList(SysCustomerCase sysCustomerCase)
+    public TableDataInfo caseList(SysCustomerCase sysCustomerCase) {
-    {
         startPage();
         sysCustomerCase.setKeywordArray(StringUtils.isNotEmpty(sysCustomerCase.getKeyword()) ? sysCustomerCase.getKeyword().split(",") : null);
         List<CustomerCaseResponse> list = sysCustomerCaseService.getWxCustomerCaseList(sysCustomerCase);
@@ -85,12 +77,11 @@ public class WechatAppletController extends BaseController {
      * 查询客户案例文件列表
      */
     @GetMapping("/getFileByCaseId")
-    public AjaxResult getFileByCaseId(@RequestParam("caseId")String caseId)
+    public AjaxResult getFileByCaseId(@RequestParam("caseId") String caseId) {
-    {
+        Long id = StringUtils.isNotEmpty(caseId) ? Long.parseLong(AesUtils.decrypt(caseId, null)) : -1L;
-        Long id = StringUtils.isNotEmpty(caseId) ? Long.parseLong(AesUtils.decrypt(caseId, null)) : null;
         CustomerCaseResponse customerCaseResponse = new CustomerCaseResponse();
         customerCaseResponse.setId(caseId);
-        if(id != null){
+        if (id != -1) {
             List<SysCustomerCaseFile> list = sysCustomerCaseService.getFileListByCaseId(id);
             List<String> fileUrl = new ArrayList<>();
             for (SysCustomerCaseFile caseFile : list) {
@@ -106,6 +97,7 @@ public class WechatAppletController extends BaseController {
 
     /**
      * 同步客户信息
+     *
      * @param sysWxUserInfo
      * @return
      */
@@ -137,6 +129,7 @@ public class WechatAppletController extends BaseController {
 
     /**
      * 微信小程序获取客户打卡记录
+     *
      * @param sysWxUserLog
      * @return
      */
@@ -178,6 +171,7 @@ public class WechatAppletController extends BaseController {
 
     /**
      * 今日是否打卡
+     *
      * @param openid
      * @return
      */
@@ -192,6 +186,7 @@ public class WechatAppletController extends BaseController {
 
     /**
      * 微信小程序打卡
+     *
      * @param sysWxUserLog
      * @return
      */
@@ -218,8 +213,6 @@ public class WechatAppletController extends BaseController {
 
     }
 
-    public static final String[] imageName = {"breakfastImages", "lunchImages", "dinnerImages", "extraMealImages", "bodyImages"};
-
     /**
      * 获取微信用户记录详细信息
      */
@@ -275,6 +268,7 @@ public class WechatAppletController extends BaseController {
 
     /**
      * 处理返回值的ID加密
+     *
      * @param list
      * @return
      */
@@ -328,8 +322,7 @@ public class WechatAppletController extends BaseController {
      * 新增营养小知识提问
      */
     @PostMapping("/addAskNutritionQuestion")
-    public AjaxResult addAskNutritionQuestion(@RequestBody SysAskNutritionQuestion sysAskNutritionQuestion)
+    public AjaxResult addAskNutritionQuestion(@RequestBody SysAskNutritionQuestion sysAskNutritionQuestion) {
-    {
         if (StringUtils.isEmpty(sysAskNutritionQuestion.getOpenid()) || StringUtils.isEmpty(sysAskNutritionQuestion.getQuestion())) {
             return AjaxResult.error("添加失败");
         }
@@ -342,11 +335,9 @@ public class WechatAppletController extends BaseController {
     @GetMapping(value = "/getCustomerMessage")
     public TableDataInfo getCustomerMessage(SysMessageNotice sysMessageNotice) {
         startPage();
-        if(StringUtils.isNotEmpty(sysMessageNotice.getCustomerId())){
+        Long cusId = StringUtils.isNotEmpty(sysMessageNotice.getCustomerId()) ? Long.parseLong(AesUtils.decrypt(sysMessageNotice.getCustomerId())) : 0L;
-            sysMessageNotice.setMessageCustomer(Long.parseLong(AesUtils.decrypt(sysMessageNotice.getCustomerId(), null)));
+
-        }else{
+        sysMessageNotice.setMessageCustomer(cusId);
-            sysMessageNotice.setMessageCustomer(0L);
-        }
         List<MessageNoticeResponse> list = sysMessageNoticeService.getCustomerMessage(sysMessageNotice);
         return getDataTable(list);
     }
@@ -413,4 +404,43 @@ public class WechatAppletController extends BaseController {
         }
         return result;
     }
+
+    @PostMapping("/login")
+    public AjaxResult login(@RequestBody SysWxUserInfo sysWxUserInfo) {
+        if (StringUtils.isEmpty(sysWxUserInfo.getOpenid())) {
+            return AjaxResult.error("缺少参数：openid");
+        }
+        SysWxUserInfo curWxUserInfo = sysWxUserInfoService.selectSysWxUserInfoById(sysWxUserInfo.getOpenid());
+
+        // 第一次尝试匹配，搜索sys_wx_user_info表，尝试查找cus_id，此时不需要手机号
+        if (StringUtils.isEmpty(sysWxUserInfo.getPhone()) && (StringUtils.isNull(curWxUserInfo) || StringUtils.isNull(curWxUserInfo.getCusId()))) {
+            // 如果没找到任何信息，此时为未登录过的新用户 || 没有cusId，没有创建用户信息
+            return AjaxResult.error(5000, "需要手机号进一步匹配");
+        }
+
+        // 第二次尝试匹配，带上手机号，先去sys_customer查找，找到就更新sys_wx_user_info表，并返回一系列登录后的数据
+        if (StringUtils.isNotEmpty(sysWxUserInfo.getPhone())) {
+            SysCustomer sysCustomer = iSysCustomerService.getCustomerByPhone(sysWxUserInfo.getPhone());
+            if (StringUtils.isNull(sysCustomer)) {
+                return AjaxResult.error(5003, "未查到用户信息，请联系销售顾问");
+            }
+
+            if (StringUtils.isNull(curWxUserInfo)) {
+                // 新增sys_wx_user_info
+                sysWxUserInfo.setCusId(sysCustomer.getId());
+                sysWxUserInfo.setCreateTime(DateUtils.getNowDate());
+                sysWxUserInfoService.insertSysWxUserInfo(sysWxUserInfo);
+            } else {
+                // 更新sys_wx_user_info数据，
+                curWxUserInfo.setCusId(sysCustomer.getId());
+                curWxUserInfo.setUpdateTime(DateUtils.getNowDate());
+                sysWxUserInfoService.updateSysWxUserInfo(curWxUserInfo);
+            }
+        }
+
+        curWxUserInfo.setCustomerId(AesUtils.encrypt(curWxUserInfo.getCusId().toString()));
+
+        // 并返回一系列登录后的数据
+        return AjaxResult.success(curWxUserInfo);
+    }
 }

stdiet-common/src/main/java/com/stdiet/common/utils/sign/AesUtils.java

@@ -18,8 +18,14 @@ public class AesUtils {
     private static final String DEFAULT_CIPHER_ALGORITHM = "AES/ECB/PKCS5Padding";  //默认的加密算法
     private static final String DEFAULT_KEY = "Yhokm#876OTG!c";
 
+
+    public static String encrypt(String content) {
+        return encrypt(content, null);
+    }
+
     /**
      * AES 加密操作
+     *
      * @param content 待加密内容
      * @param key     加密密码
      * @return 返回Base64转码后的加密数据
@@ -44,8 +50,14 @@ public class AesUtils {
         return null;
     }
 
+
+    public static String decrypt(String content) {
+        return decrypt(content, null);
+    }
+
     /**
      * AES 解密操作
+     *
      * @param content
      * @param key
      * @return

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

@@ -1,9 +1,10 @@
 package com.stdiet.custom.domain;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import com.fasterxml.jackson.annotation.JsonIgnore;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.stdiet.common.annotation.Excel;
-import com.stdiet.common.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
 
 /**
  * 微信用户对象 sys_wx_user_info
@@ -11,144 +12,77 @@ import com.stdiet.common.core.domain.BaseEntity;
  * @author wonder
  * @date 2020-11-28
  */
-public class SysWxUserInfo extends BaseEntity
+@Data
-{
+public class SysWxUserInfo {
-    private static final long serialVersionUID = 1L;
 
-    /** 微信openid */
+    /**
+     * 微信openid
+     */
     private String openid;
 
-    /** 昵称 */
+    @JsonIgnore
+    private Long cusId;
+
+    private String customerId;
+
+    /**
+     * 昵称
+     */
     @Excel(name = "昵称")
     private String nickName;
 
-    /** 微信appid */
+    /**
+     * 微信appid
+     */
     @Excel(name = "微信appid")
     private String appid;
 
-    /** 电话 */
+    /**
+     * 电话
+     */
     @Excel(name = "电话")
     private String phone;
 
-    /** 用户头像 */
+    /**
+     * 用户头像
+     */
     @Excel(name = "用户头像")
     private String avatarUrl;
 
-    /** 用户性别（0男 1女 2未知） */
+    /**
+     * 用户性别（0男 1女 2未知）
+     */
     @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知")
     private String sex;
 
-    /** 城市 */
+    /**
+     * 城市
+     */
     @Excel(name = "城市")
     private String city;
 
-    /** 省份 */
+    /**
+     * 省份
+     */
     @Excel(name = "省份")
     private String province;
 
-    /** 国家 */
+    private String language;
+
+    /**
+     * 国家
+     */
     @Excel(name = "国家")
     private String country;
 
-    public void setOpenid(String openid)
+    private Date createTime;
-    {
-        this.openid = openid;
-    }
 
-    public String getOpenid()
+    private String createBy;
-    {
-        return openid;
-    }
-    public void setNickName(String nickName)
-    {
-        this.nickName = nickName;
-    }
 
-    public String getNickName()
+    private Date updateTime;
-    {
-        return nickName;
-    }
-    public void setAppid(String appid)
-    {
-        this.appid = appid;
-    }
 
-    public String getAppid()
+    private String updateBy;
-    {
-        return appid;
-    }
-    public void setPhone(String phone)
-    {
-        this.phone = phone;
-    }
 
-    public String getPhone()
+    private String remark;
-    {
-        return phone;
-    }
-    public void setAvatarUrl(String avatarUrl)
-    {
-        this.avatarUrl = avatarUrl;
-    }
 
-    public String getAvatarUrl()
-    {
-        return avatarUrl;
-    }
-    public void setSex(String sex)
-    {
-        this.sex = sex;
-    }
-
-    public String getSex()
-    {
-        return sex;
-    }
-    public void setCity(String city)
-    {
-        this.city = city;
-    }
-
-    public String getCity()
-    {
-        return city;
-    }
-    public void setProvince(String province)
-    {
-        this.province = province;
-    }
-
-    public String getProvince()
-    {
-        return province;
-    }
-    public void setCountry(String country)
-    {
-        this.country = country;
-    }
-
-    public String getCountry()
-    {
-        return country;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-                .append("openid", getOpenid())
-                .append("nickName", getNickName())
-                .append("appid", getAppid())
-                .append("phone", getPhone())
-                .append("avatarUrl", getAvatarUrl())
-                .append("sex", getSex())
-                .append("city", getCity())
-                .append("province", getProvince())
-                .append("country", getCountry())
-                .append("createBy", getCreateBy())
-                .append("createTime", getCreateTime())
-                .append("updateBy", getUpdateBy())
-                .append("updateTime", getUpdateTime())
-                .append("remark", getRemark())
-                .toString();
-    }
 }

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/SysOrderPauseMapper.xml

@@ -25,7 +25,7 @@
     </sql>
 
     <sql id="selectSysOrderPauseVo">
-        select id, order_id, cus_id, out_id, pause_start_date, pause_end_date, reason, remarks, create_time, create_by, update_time, update_by, del_flag from sys_recipes_pause sop
+        select id, order_id, cus_id, pause_start_date, pause_end_date, reason, remarks, create_time, create_by, update_time, update_by, del_flag from sys_recipes_pause sop
     </sql>
 
     <select id="selectSysOrderPauseList" parameterType="SysOrderPause" resultMap="SysOrderPauseResult">
@@ -86,7 +86,7 @@
         <trim prefix="SET" suffixOverrides=",">
             <if test="orderId != null">order_id = #{orderId},</if>
             <if test="cusId != null">cus_id = #{cusId},</if>
-            <if test="outId != null">out_id = #{outId},</if>
+            <if test="cusId != null">out_id = md5(#{cusId}),</if>
             <if test="pauseStartDate != null">pause_start_date = #{pauseStartDate},</if>
             <if test="pauseEndDate != null">pause_end_date = #{pauseEndDate},</if>
             <if test="reason != null">reason = #{reason},</if>

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

@@ -6,6 +6,7 @@
 
     <resultMap type="SysWxUserInfo" id="SysWxUserInfoResult">
         <result property="openid" column="openid"/>
+        <result property="cusId" column="cus_id"/>
         <result property="nickName" column="nick_name"/>
         <result property="appid" column="appid"/>
         <result property="phone" column="phone"/>
@@ -19,10 +20,11 @@
         <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">
-        select openid, nick_name, appid, phone, avatar_url, sex, city, province, country, create_by, create_time, update_by, update_time, remark from sys_wx_user_info
+        select * from sys_wx_user_info
     </sql>
 
     <select id="selectSysWxUserInfoList" parameterType="SysWxUserInfo" resultMap="SysWxUserInfoResult">
@@ -54,6 +56,7 @@
             <if test="openid != null">openid,</if>
             <if test="nickName != null">nick_name,</if>
             <if test="appid != null">appid,</if>
+            <if test="cusId != null">cus_id,</if>
             <if test="phone != null">phone,</if>
             <if test="avatarUrl != null">avatar_url,</if>
             <if test="sex != null">sex,</if>
@@ -65,11 +68,13 @@
             <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="phone != null">#{phone},</if>
             <if test="avatarUrl != null">#{avatarUrl},</if>
             <if test="sex != null">#{sex},</if>
@@ -81,6 +86,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>
 
@@ -89,6 +95,7 @@
         <trim prefix="SET" suffixOverrides=",">
             <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="phone != null">phone = #{phone},</if>
             <if test="avatarUrl != null">avatar_url = #{avatarUrl},</if>
             <if test="sex != null">sex = #{sex},</if>
@@ -100,6 +107,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>

stdiet-ui/src/views/custom/recipesShow/index.vue

@@ -18,6 +18,7 @@
     <div v-loading="loading">
       <div class="content">
         <MenuDetail :value="menuData" :date="curDate" />
+        <div class="bei_an">粤ICP备2020073675</div>
       </div>
     </div>
 
@@ -204,6 +205,13 @@ export default {
   .content {
     height: calc(100vh - 44px);
     overflow: auto;
+
+    .bei_an {
+      text-align: center;
+      padding: 8px;
+      font-size: 12px;
+      color: #8c8c8c;
+    }
   }
 }
 </style>