导购绑定

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/SendCodeController.java

 package com.gic.haoban.manage.web.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.gic.clerk.api.service.ClerkService;
+import com.gic.enterprise.api.dto.ClerkDTO;
 import com.gic.enterprise.api.dto.StoreDTO;
 import com.gic.enterprise.api.service.StoreService;
 import com.gic.haoban.common.utils.CheckSmsCodeUtil;
@@ -27,6 +29,8 @@ public class SendCodeController extends WebBaseController {
 
     @Autowired
     private StoreService storeService;
+    @Autowired
+    private ClerkService clerkService ;
 
     /**
      * 验证码发送
@@ -36,7 +40,7 @@ public class SendCodeController extends WebBaseController {
      */
     @RequestMapping("/send-code")
     public HaobanResponse sendCode(String phoneNumber, @RequestParam(defaultValue = "86") String nationcode,
-                                   Integer type, @RequestParam(defaultValue = "0") int isTest, String wxEnterpriseId, String staffId,
+                                   Integer type, String wxEnterpriseId, String staffId,
                                    String storeId, String clerkId) {
         logger.info("短信验证码发送：wxEnterpriseId:{},storeId:{},staffId:{}", wxEnterpriseId, storeId, staffId);
         if (StringUtils.isBlank(phoneNumber) || null == type) {
@@ -70,26 +74,18 @@ public class SendCodeController extends WebBaseController {
             CheckSmsCodeUtil.cacheSmsCode(nationcode + "-" + phoneNumber, smsCode, type);
         }
         logger.info("{}-{} 的 验证码：{}", nationcode, phoneNumber, smsCode);
-        //非测试
-        if (isTest != 1) {
-            SendSmsResponse smsResponse = null;
-            if (StringUtils.isAnyBlank(storeId, clerkId)) {
-                smsResponse = validationCodeService.sendValidationCode(nationcode, phoneNumber, smsCode);
-            } else {
-                StoreDTO storeDTO = storeService.getStore(storeId);
-                smsResponse = validationCodeService.sendValidationCodeHb3(nationcode, phoneNumber, smsCode, storeDTO.getEnterpriseId(), storeId, clerkId, true);
-            }
-            logger.info("{}-{} 的 验证码 发送结果回执：{}", nationcode, phoneNumber, JSON.toJSONString(smsResponse));
-            if (!smsResponse.isSuccess()) {
-                HaobanResponse response = new HaobanResponse();
-                response.setMessage(smsResponse.getMessage());
-                response.setErrorCode(HaoBanErrCode.ERR_13.getCode());
-                return response;
-            }
-            return resultResponse(HaoBanErrCode.ERR_1);
-        } else {
-            return resultResponse(HaoBanErrCode.ERR_1, smsCode);
+        SendSmsResponse smsResponse = null;
+        ClerkDTO clerk = this.clerkService.getClerkByClerkId(clerkId) ;
+        smsResponse = validationCodeService.sendValidationCodeHb3(nationcode, phoneNumber, smsCode, clerk.getEnterpriseId(), storeId, clerkId, true);
+        logger.info("{}-{} 的 验证码 发送结果回执：{}", nationcode, phoneNumber, JSON.toJSONString(smsResponse));
+        if (!smsResponse.isSuccess()) {
+            HaobanResponse response = new HaobanResponse();
+            response.setMessage(smsResponse.getMessage());
+            response.setErrorCode(HaoBanErrCode.ERR_13.getCode());
+            return response;
         }
+        return resultResponse(HaoBanErrCode.ERR_1);
+
     }
 
     /**