bug fix

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju.welcome</groupId>
 	<artifactId>mainbiz</artifactId>
-	<version>v4.0.0</version>
+	<version>v4.0.1</version>
 	<name>mainbiz</name>
 	<description>com.huiju.welcome main service</description>
 

src/main/java/com.huiju.welcome/config/SMSProperties.java

@@ -0,0 +1,29 @@
+package com.huiju.welcome.config;
+
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@Data
+@ConfigurationProperties(prefix = "sms")
+public class SMSProperties {
+    String url;
+    String method;
+    String contentType;
+    Captcha captcha;
+
+    @Data
+    public static class Template {
+        String code;
+        String tel;
+        String[] params;
+    }
+
+    @Data
+    public static class Captcha {
+        String code;
+        Integer expire;
+        Integer size;
+        String sign;
+    }
+}

src/main/java/com.huiju.welcome/controller/TaGoodsOrdersController.java

@@ -6,19 +6,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.welcome.common.base.BaseController;
 import com.huiju.welcome.common.base.ResponseBean;
-import com.huiju.welcome.model.SysUser;
-import com.huiju.welcome.model.TaGoodsOrders;
-import com.huiju.welcome.model.TaGoodsOrdersDetail;
-import com.huiju.welcome.model.TdGoodsType;
-import com.huiju.welcome.service.ISysUserService;
-import com.huiju.welcome.service.ITaGoodsOrdersDetailService;
-import com.huiju.welcome.service.ITaGoodsOrdersService;
+import com.huiju.welcome.model.*;
+import com.huiju.welcome.service.*;
 import com.huiju.welcome.utils.JWTUtils;
 import com.huiju.welcome.utils.StatusUtils;
 import com.huiju.welcome.utils.StringUtils;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.models.auth.In;
+import org.apache.http.HttpStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,6 +45,10 @@ public class TaGoodsOrdersController extends BaseController {
     public ITaGoodsOrdersDetailService iTaGoodsOrdersDetailService;
     @Autowired
     public ISysUserService iSysUserService;
+    @Autowired
+    public ITaMainUsherRecordService iTaMainUsherRecordService;
+    @Autowired
+    public ITaCustomerService iTaCustomerService;
 
 
     /**
@@ -70,6 +70,20 @@ public class TaGoodsOrdersController extends BaseController {
             Integer recId = iTaGoodsOrdersService.getRecIdByCustomerIdCurrentDate(taGoodsOrders.getCustomerId());
             if(recId != null){
                 taGoodsOrders.setRecId(recId);
+            } else {
+                //
+                TaCustomer cust = iTaCustomerService.getById(taGoodsOrders.getCustomerId());
+                if (cust != null) {
+                    boolean ok = iTaMainUsherRecordService.newRecordByConsultant(cust, null);
+
+                    if (!ok) {
+                        return ResponseBean.error("更新客户到访失败", HttpStatus.SC_INTERNAL_SERVER_ERROR);
+                    }
+                    recId = iTaGoodsOrdersService.getRecIdByCustomerIdCurrentDate(taGoodsOrders.getCustomerId());
+                    taGoodsOrders.setRecId(recId);
+                } else {
+                    return ResponseBean.error("关联客户信息失败", HttpStatus.SC_INTERNAL_SERVER_ERROR);
+                }
             }
             Boolean flag = iTaGoodsOrdersService.save(taGoodsOrders);
 

src/main/java/com.huiju.welcome/controller/TaTransactionRecordController.java

@@ -1,12 +1,16 @@
 package com.huiju.welcome.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.welcome.common.base.BaseController;
 import com.huiju.welcome.common.base.ResponseBean;
+import com.huiju.welcome.model.TaCustomer;
 import com.huiju.welcome.model.TaTransactionRecord;
+import com.huiju.welcome.service.ITaCustomerService;
 import com.huiju.welcome.service.ITaTransactionRecordService;
+import com.huiju.welcome.utils.StatusUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +39,9 @@ public class TaTransactionRecordController extends BaseController {
     @Autowired
     public ITaTransactionRecordService iTaTransactionRecordService;
 
+    @Autowired
+    public ITaCustomerService iTaCustomerService;
+
 
     /**
      * 分页查询列表
@@ -70,6 +77,12 @@ public class TaTransactionRecordController extends BaseController {
     public ResponseBean taTransactionRecordAdd(@RequestBody TaTransactionRecord taTransactionRecord){
         ResponseBean responseBean = new ResponseBean();
         try {
+            // 反更新客户表
+            UpdateWrapper<TaCustomer> wrapper = new UpdateWrapper<>();
+            wrapper.eq("customer_id", taTransactionRecord.getCustomerId());
+            wrapper.set("status", StatusUtils.BizDone);
+            iTaCustomerService.update(new TaCustomer(), wrapper);
+
             if (iTaTransactionRecordService.save(taTransactionRecord)){
                 responseBean.addSuccess(taTransactionRecord);
             }else {
@@ -114,6 +127,12 @@ public class TaTransactionRecordController extends BaseController {
                                         @RequestBody TaTransactionRecord taTransactionRecord){
         ResponseBean responseBean = new ResponseBean();
         try {
+            // 反更新客户表
+            UpdateWrapper<TaCustomer> wrapper = new UpdateWrapper<>();
+            wrapper.eq("customer_id", taTransactionRecord.getCustomerId());
+            wrapper.set("status", StatusUtils.BizDone);
+            iTaCustomerService.update(new TaCustomer(), wrapper);
+
             taTransactionRecord.setRecordId(id);
             if (iTaTransactionRecordService.updateById(taTransactionRecord)){
                 responseBean.addSuccess(taTransactionRecord);

src/main/java/com.huiju.welcome/controller/TaWechatUserController.java

@@ -12,14 +12,12 @@ import com.huiju.welcome.model.TaWechatUser;
 import com.huiju.welcome.service.ISysUserService;
 import com.huiju.welcome.service.ITaPersonService;
 import com.huiju.welcome.service.ITaWechatUserService;
-import com.huiju.welcome.utils.CommConstant;
-import com.huiju.welcome.utils.JWTUtils;
-import com.huiju.welcome.utils.MiniApp;
-import com.huiju.welcome.utils.StatusUtils;
+import com.huiju.welcome.utils.*;
 import org.apache.http.HttpStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.web.bind.annotation.*;
 
@@ -54,6 +52,9 @@ public class TaWechatUserController extends BaseController {
     @Autowired
     private ISysUserService iSysUserService;
 
+    @Autowired
+    private SMSUtils smsUtils;
+
     @GetMapping("/login")
     public ResponseBean login(@RequestParam String code) {
         ResponseBean resp = miniApp.getOpenid(code);
@@ -103,6 +104,16 @@ public class TaWechatUserController extends BaseController {
         return ResponseBean.success(map);
     }
 
+    @PostMapping("/captcha")
+    public ResponseBean sendCaptcha(@RequestParam String tel) {
+        boolean success = smsUtils.sendCaptcha(tel);
+        if (success) {
+            return ResponseBean.success("发送验证码成功");
+        } else {
+            return ResponseBean.error("验证码发送失败, 请重试", HttpStatus.SC_INTERNAL_SERVER_ERROR);
+        }
+    }
+
     @PostMapping("/bind")
     public ResponseBean bind(@RequestBody String paramStr, HttpServletRequest request) {
         String userId = JWTUtils.getSubject(request);
@@ -128,10 +139,12 @@ public class TaWechatUserController extends BaseController {
             return ResponseBean.error("绑定参数为空或者非法", HttpStatus.SC_BAD_REQUEST);
         }
 
-        // todo
-        // 先简单验证
-        if (!"1234".equals(captcha)) {
-            return ResponseBean.error("绑定参数为空或者非法", HttpStatus.SC_BAD_REQUEST);
+        // 校验短信验证码, 当前年度为万能码
+        LocalDateTime now = LocalDateTime.now();
+        if (!String.valueOf(now.getYear()).equals(captcha)) {
+            if (!smsUtils.checkCaptcha(phone, captcha)) {
+                return ResponseBean.error("验证码不正确或已过期", HttpStatus.SC_BAD_REQUEST);
+            }
         }
 
         SysUser sysUser = iSysUserService.getByPhone(phone);

src/main/java/com.huiju.welcome/service/impl/TaCarRecordServiceImpl.java

@@ -7,10 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.welcome.mapper.TaCarRecordMapper;
 import com.huiju.welcome.model.*;
 import com.huiju.welcome.service.*;
-import com.huiju.welcome.utils.AliFaceUtils;
-import com.huiju.welcome.utils.CommConstant;
-import com.huiju.welcome.utils.StatusUtils;
-import com.huiju.welcome.utils.TencentFaceUtils;
+import com.huiju.welcome.utils.*;
 import com.tencentcloudapi.common.exception.TencentCloudSDKException;
 import com.tencentcloudapi.iai.v20180301.models.Candidate;
 import org.slf4j.Logger;
@@ -226,11 +223,10 @@ public class TaCarRecordServiceImpl extends ServiceImpl<TaCarRecordMapper, TaCar
     @Override
     public List<TaCarRecord> getTimeline() {
         LocalDateTime now = LocalDateTime.now();
+        String dayBegin = DateUtils.localDatetime2day(now) + " 00:00:00";
 
-        // 四小时内
-        LocalDateTime fourHour = now.minusHours(4);
         QueryWrapper<TaCarRecord> query = new QueryWrapper<>();
-        query.ge("create_date", fourHour);
+        query.ge("create_date", dayBegin);
         query.groupBy("plate_number");
         query.orderByDesc("create_date");
         List<TaCarRecord> result = taCarRecordMapper.selectList(query);

src/main/java/com.huiju.welcome/service/impl/TaCustomerServiceImpl.java

@@ -315,37 +315,37 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
         List<SysDict> dictList = iSysDictService.list();
         dictList.stream().forEach(e -> {
             //对比数据重新赛值
-            if (e.getId().equals(taCustomer.getNowArea())){
+            if (null != taCustomer.getNowArea() && e.getId().equals(taCustomer.getNowArea())){
                 taCustomer.setNowAreaLable(e.getLabel());
             }
-            if (e.getId().equals(taCustomer.getFamilyWork())){
+            if (null != taCustomer.getFamilyWork() && e.getId().equals(taCustomer.getFamilyWork())){
                 taCustomer.setFamilyWorkLable(e.getLabel());
             }
-            if (e.getId().equals(Integer.valueOf(taCustomer.getFamilyIndustry()))){
+            if (null != taCustomer.getFamilyIndustry() && e.getId().equals(Integer.valueOf(taCustomer.getFamilyIndustry()))){
                 taCustomer.setFamilyIndustryLable(e.getLabel());
             }
-            if (e.getId().equals(Integer.valueOf(taCustomer.getFamilyDuty()))){
+            if (null != taCustomer.getFamilyDuty() && e.getId().equals(Integer.valueOf(taCustomer.getFamilyDuty()))){
                 taCustomer.setFamilyDutyLable(e.getLabel());
             }
-            if (e.getId().equals(taCustomer.getHousePurchasing())){
+            if (null != taCustomer.getHousePurchasing() && e.getId().equals(taCustomer.getHousePurchasing())){
                 taCustomer.setHousePurchasingLable(e.getLabel());
             }
-            if (e.getId().equals(taCustomer.getHouseProperty())){
+            if (null != taCustomer.getHouseProperty() && e.getId().equals(taCustomer.getHouseProperty())){
                 taCustomer.setHousePropertyLable(e.getLabel());
             }
-            if (e.getId().equals(taCustomer.getHouseLivingArea())){
+            if (null != taCustomer.getHouseLivingArea() && e.getId().equals(taCustomer.getHouseLivingArea())){
                 taCustomer.setHouseLivingAreaLable(e.getLabel());
             }
-            if (e.getId().equals(taCustomer.getHouseType())){
+            if (null != taCustomer.getHouseType() && e.getId().equals(taCustomer.getHouseType())){
                 taCustomer.setHouseTypeLable(e.getLabel());
             }
-            if (e.getId().equals(taCustomer.getFamilyStructure())){
+            if (null != taCustomer.getFamilyStructure() && e.getId().equals(taCustomer.getFamilyStructure())){
                 taCustomer.setFamilyStructureLable(e.getLabel());
             }
-            if (e.getId().equals(taCustomer.getCustomerAge())){
+            if (null != taCustomer.getCustomerAge() && e.getId().equals(taCustomer.getCustomerAge())){
                 taCustomer.setCustomerAgeLable(e.getLabel());
             }
-            if (e.getId().equals(Integer.valueOf(taCustomer.getFavorLevel()))){
+            if (null != taCustomer.getFavorLevel() && e.getId().equals(Integer.valueOf(taCustomer.getFavorLevel()))){
                 taCustomer.setFavorLevelLable(e.getLabel());
             }
         });

src/main/java/com.huiju.welcome/service/impl/TaMainUsherRecordServiceImpl.java

@@ -465,14 +465,15 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
                 return false;
             }
         } else {
+            TaMainUsherRecord origin = taMainUsherRecordMapper.selectById(taMainUsherRecord.getRecId());
             String remark = taMainUsherRecord.getRemark();
         
             if (null == remark) {
-                remark = taCustomer.getRemark();
+                remark = origin.getRemark();
+            }
+            else if (!StringUtils.isEmpty(origin.getRemark()) && !remark.equals(origin.getRemark())) {
+                remark += "\n\n---" + DateUtils.cutSecond(LocalDateTime.now())+ "---" + "\n" + origin.getRemark();
             }
-            //else if (!StringUtils.isEmpty(taCustomer.getRemark())) {
-            //    remark += "\n\n---" + DateUtils.cutSecond(LocalDateTime.now())+ "---" + "\n" + taCustomer.getRemark();
-            //}
             taMainUsherRecord.setRemark(remark);
         
             int row = taMainUsherRecordMapper.updateById(taMainUsherRecord);
@@ -485,10 +486,13 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
 	        queryWrapper.eq("rec_id",taMainUsherRecord.getRecId());
 	        taFollowupRecordMapper.delete(queryWrapper);
         }
-	    for (TaFollowupRecord follow : taFollowupRecordList) {
-		    follow.setRecId(taMainUsherRecord.getRecId());
-		    taFollowupRecordMapper.insert(follow);
-	    }
+
+        if (null != taFollowupRecordList) {
+            for (TaFollowupRecord follow : taFollowupRecordList) {
+                follow.setRecId(taMainUsherRecord.getRecId());
+                taFollowupRecordMapper.insert(follow);
+            }
+        }
     
         return true;
     }

src/main/java/com.huiju.welcome/service/impl/TaVisitingLogServiceImpl.java

@@ -14,6 +14,7 @@ import com.huiju.welcome.model.TaVisitingLog;
 import com.huiju.welcome.service.ITaDeviceService;
 import com.huiju.welcome.service.ITaPersonService;
 import com.huiju.welcome.service.ITaVisitingLogService;
+import com.huiju.welcome.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -63,11 +64,10 @@ public class TaVisitingLogServiceImpl extends ServiceImpl<TaVisitingLogMapper, T
     @Override
     public ResponseBean getTimeline() {
         LocalDateTime now = LocalDateTime.now();
+        String todayBegin = DateUtils.localDatetime2day(now) + " 00:00:00";
 
-        // 四小时内
-        LocalDateTime fourHour = now.minusHours(4);
         QueryWrapper<TaVisitingLog> query4 = new QueryWrapper<>();
-        query4.ge("visite_date", fourHour);
+        query4.ge("visite_date", todayBegin);
         query4.groupBy("real_person");
         query4.orderByDesc("visite_date");
         List<TaVisitingLog> fourHourList = taVisitingLogMapper.selectList(query4);

src/main/java/com.huiju.welcome/utils/CommConstant.java

@@ -4,6 +4,7 @@ public class CommConstant {
     public final static String IDENTITY_CONSULTANT = "consultant";
     public final static String IDENTITY_FIRSTUSHER = "first-usher";
     public final static String IDENTITY_MAINUSHER = "main-usher";
+    public final static String IDENTITY_BARUSHER = "bar-usher";
 
     public final static String PAGE_MY_CUSTOMER = "pages/client/myclient/myclient";
 

src/main/java/com.huiju.welcome/utils/SMSUtils.java

@@ -0,0 +1,128 @@
+package com.huiju.welcome.utils;
+
+import com.alibaba.fastjson.JSONObject;
+import com.huiju.welcome.config.SMSProperties;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.*;
+import org.springframework.web.client.RestTemplate;
+
+import java.time.LocalDateTime;
+import java.util.*;
+
+@Slf4j
+@Configuration
+@EnableConfigurationProperties(SMSProperties.class)
+public class SMSUtils {
+    // 短信服务配置
+    SMSProperties smsProperties;
+
+    Map<String, Phone> allPhones;
+
+    @Autowired
+    public SMSUtils(SMSProperties properties) {
+        smsProperties = properties;
+        allPhones = new HashMap<>();
+    }
+
+    /**
+     * 发送验证码到 tel
+     * @param tel
+     * @return
+     */
+    public boolean sendCaptcha(String tel) {
+        Phone phone = allPhones.get(tel);
+        if (null == phone) {
+            phone = new Phone();
+            phone.setTel(tel);
+        }
+
+        phone.setCaptcha(genCaptcha(smsProperties.getCaptcha().getSize()));
+        phone.setExpire(LocalDateTime.now().plusSeconds(smsProperties.getCaptcha().getExpire()));
+        allPhones.put(tel, phone);
+
+        log.info("发送手机 {} 验证码 {}", tel, phone.getCaptcha());
+
+        String[] params = { phone.getCaptcha(), smsProperties.getCaptcha().getSign() };
+        return sendMessage(smsProperties.getCaptcha().getCode(), tel, params);
+    }
+
+    /**
+     * 校验验证码
+     * @param tel
+     * @param smsCaptcha
+     * @return
+     */
+    public boolean checkCaptcha(String tel, String smsCaptcha) {
+        Phone phone = allPhones.get(tel);
+        if (null == phone) {
+            log.error("手机号 {} 的验证码未找到", tel);
+            return false;
+        }
+
+        if (null == smsCaptcha || !smsCaptcha.equals(phone.getCaptcha())) {
+            log.error("手机号 {} 校验验证码出错, 正确: {}, 错误: {}", tel, phone.getCaptcha(), smsCaptcha);
+            return false;
+        }
+
+        LocalDateTime now = LocalDateTime.now();
+        if (now.isAfter(phone.getExpire())) {
+            log.error("手机号 {} 的验证码已过期", tel);
+            return false;
+        }
+
+        // 如果验证成功, 则从缓存中删除
+        allPhones.remove(tel);
+        return true;
+    }
+
+    private String genCaptcha(int length) {
+        List<String> nums = new ArrayList<>();
+        for (int i = 0; i < length; i ++) {
+            int rand = (new Random()).nextInt(10);
+            nums.add(String.valueOf(rand));
+        }
+        return String.join("", nums);
+    }
+
+    private boolean sendMessage(String code, String tel, String[] params) {
+        // 发送内容
+        SMSProperties.Template message = new SMSProperties.Template();
+        message.setCode(code);
+        message.setTel(tel);
+        message.setParams(params);
+
+        // 构造 request
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.parseMediaType(smsProperties.getContentType()));
+//        String body = JSONObject.toJSONString(message);
+        HttpMethod method = HttpMethod.resolve(smsProperties.getMethod());
+        HttpEntity requestEntity = new HttpEntity(message, headers);
+
+        RestTemplate template = new RestTemplate();
+        HttpEntity<String> response = template.exchange(
+                smsProperties.getUrl(),
+                method,
+                requestEntity,
+                String.class,
+                new Object()
+        );
+
+        if (((ResponseEntity<String>) response).getStatusCodeValue() != HttpStatus.OK.value()) {
+            log.error("请求发送短信验证码失败: {}", response.toString());
+            return false;
+        }
+
+        return true;
+    }
+
+    @Data
+    public static class Phone {
+        String tel;
+        String captcha;
+        LocalDateTime expire;
+    }
+}

src/main/resources/application.yml

@@ -1,7 +1,7 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-#    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/welcome3?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
+#    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/welcome3?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
 #    username: welcome
 #    password: s190QU2#z%hdU%^FPkY9qjls
     url: jdbc:mysql://47.101.36.130:3306/welcome3?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
@@ -72,4 +72,26 @@ tencent:
   secretKey: oKhohKlwsSowqa5KM8drpX1FCtLfmhMq
   iai:
     region: ap-shanghai
-    group: default
+    group: default
+
+# 手机短信服务
+sms:
+  url: http://micservice.ycjcjy.com/sms
+  method: POST
+  contentType: "application/json;charset=UTF-8"
+  template:
+    code:
+    tel:
+    params:
+
+  # 以下为各模板 code
+  # 验证码
+  captcha:
+    # 模板 code
+    code: "0301"
+    # 有效时间 秒
+    expire: 120
+    # 验证码长度
+    size: 4
+    # 短信签名
+    sign: AI智慧案场

src/main/resources/mapper/TaCustomerMapper.xml

@@ -64,7 +64,7 @@
             *
         FROM
             ta_customer t
-        WHERE t.status = 1
+        WHERE t.status > 0
             <if test="consultantId !=null">
               AND t.consultant_id = #{consultantId}
             </if>