fix：增加日志

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

@@ -7,7 +7,6 @@ import com.gic.haoban.common.utils.CheckSmsCodeUtil;
 import com.gic.haoban.common.utils.GooglePhoneNumberUtil;
 import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.communicate.api.service.valid.ValidationCodeService;
-import com.gic.haoban.manage.api.service.StaffApiService;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.redis.data.util.RedisUtil;
 import com.gic.reponse.SendSmsResponse;
@@ -20,16 +19,11 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-public class SendCodeController extends WebBaseController{
-	
-	
-	private static Logger logger = LoggerFactory.getLogger(SendCodeController.class);
-	
-	@Autowired
-	private StaffApiService staffApiService;
-	
-	@Autowired
-	private ValidationCodeService validationCodeService;
+public class SendCodeController extends WebBaseController {
+    private static Logger logger = LoggerFactory.getLogger(SendCodeController.class);
+
+    @Autowired
+    private ValidationCodeService validationCodeService;
 
     @Autowired
     private StoreService storeService;
@@ -42,7 +36,9 @@ 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 storeId, String clerkId) {
+                                   Integer type, @RequestParam(defaultValue = "0") int isTest, String wxEnterpriseId, String staffId,
+                                   String storeId, String clerkId) {
+        logger.info("短信验证码发送：wxEnterpriseId:{},storeId:{},staffId:{}", wxEnterpriseId, storeId, staffId);
         if (StringUtils.isBlank(phoneNumber) || null == type) {
             logger.info("没有phoneNumber!");
             return resultResponse(HaoBanErrCode.ERR_5);
@@ -51,38 +47,29 @@ public class SendCodeController extends WebBaseController{
             logger.info("没有phoneNumber!");
             return resultResponse(HaoBanErrCode.ERR_600002);
         }
-        
-       if(!GooglePhoneNumberUtil.checkPhoneNumber(phoneNumber,nationcode  )) {
-           logger.info("区号或者手机号码不合法:{}-{}", nationcode,phoneNumber);
-           return resultResponse(HaoBanErrCode.ERR_20);
-       }
-
-       String cacheKey = nationcode+phoneNumber+type;
-       Object value = RedisUtil.getCache(cacheKey);
-       if (value!=null && (boolean) value){
-           logger.info("手机号码:{}-{} 验证码只能一分钟请求一次", nationcode,phoneNumber);
-           return resultResponse(HaoBanErrCode.ERR_22);
-       }else {
-           RedisUtil.setCache(cacheKey, true, 60L);
-       }
 
+        if (!GooglePhoneNumberUtil.checkPhoneNumber(phoneNumber, nationcode)) {
+            logger.info("区号或者手机号码不合法:{}-{}", nationcode, phoneNumber);
+            return resultResponse(HaoBanErrCode.ERR_20);
+        }
 
-        //绑定
-        if (type == 1) {
-//            StaffDTO staffDTO = staffApiService.selectByNationcodeAndPhoneNumber(wxEnterpriseId, nationcode, phoneNumber);
-//            if (staffDTO == null) {
-//                logger.info("用户不存在:{}-{}", nationcode,phoneNumber);
-//                return resultResponse(HaoBanErrCode.ERR_8);
-//            }
+        String cacheKey = nationcode + phoneNumber + type;
+        Object value = RedisUtil.getCache(cacheKey);
+        if (value != null && (boolean) value) {
+            logger.info("手机号码:{}-{} 验证码只能一分钟请求一次", nationcode, phoneNumber);
+            return resultResponse(HaoBanErrCode.ERR_22);
+        } else {
+            RedisUtil.setCache(cacheKey, true, 60L);
         }
+
         String smsCode = "";
-        if(CheckSmsCodeUtil.getCacheSmsCode(nationcode+"-"+phoneNumber, type) != null){
-        	smsCode = (String)CheckSmsCodeUtil.getCacheSmsCode(nationcode+"-"+phoneNumber, type);
-        }else{
-        	smsCode = CheckSmsCodeUtil.createSMSCode();
-        	CheckSmsCodeUtil.cacheSmsCode( nationcode+"-"+phoneNumber, smsCode, type);
+        if (CheckSmsCodeUtil.getCacheSmsCode(nationcode + "-" + phoneNumber, type) != null) {
+            smsCode = (String) CheckSmsCodeUtil.getCacheSmsCode(nationcode + "-" + phoneNumber, type);
+        } else {
+            smsCode = CheckSmsCodeUtil.createSMSCode();
+            CheckSmsCodeUtil.cacheSmsCode(nationcode + "-" + phoneNumber, smsCode, type);
         }
-        logger.info("{}-{} 的 验证码：{}",nationcode,phoneNumber, smsCode);
+        logger.info("{}-{} 的 验证码：{}", nationcode, phoneNumber, smsCode);
         //非测试
         if (isTest != 1) {
             SendSmsResponse smsResponse = null;
@@ -92,7 +79,7 @@ public class SendCodeController extends WebBaseController{
                 StoreDTO storeDTO = storeService.getStore(storeId);
                 smsResponse = validationCodeService.sendValidationCodeHb3(nationcode, phoneNumber, smsCode, storeDTO.getEnterpriseId(), storeId, clerkId, true);
             }
-            logger.info("{}-{} 的 验证码 发送结果回执：{}",nationcode,phoneNumber, JSON.toJSONString(smsResponse));
+            logger.info("{}-{} 的 验证码 发送结果回执：{}", nationcode, phoneNumber, JSON.toJSONString(smsResponse));
             if (!smsResponse.isSuccess()) {
                 HaobanResponse response = new HaobanResponse();
                 response.setMessage(smsResponse.getMessage());
@@ -104,7 +91,7 @@ public class SendCodeController extends WebBaseController{
             return resultResponse(HaoBanErrCode.ERR_1, smsCode);
         }
     }
-    
+
     /**
      * 验证码校验
      *
@@ -113,22 +100,22 @@ public class SendCodeController extends WebBaseController{
      */
     @RequestMapping("/validate-code")
     public HaobanResponse validateCode(String phoneNumber, @RequestParam(defaultValue = "86") String nationcode,
-                                    String code, int type) {
+                                       String code, int type) {
         if (StringUtils.isBlank(phoneNumber) || StringUtils.isBlank(code)) {
             logger.info("没有phoneNumber!");
             return resultResponse(HaoBanErrCode.ERR_5);
         }
-        boolean b = CheckSmsCodeUtil.checkSmsCode(nationcode+"-"+phoneNumber, code, type);
-        
-        boolean c = CheckSmsCodeUtil.checkSmsCodeIsDelay(nationcode+"-"+phoneNumber, code, type);
-        if(!c){
-        	 logger.info("phoneNumber:{},code:{} 验证失败，验证码失效",nationcode+"-"+phoneNumber, code);
-             return resultResponse(HaoBanErrCode.ERR_21);
-        }else if(!b){
-        	 logger.info("phoneNumber:{},code:{} 验证失败，验证码失败",nationcode+"-"+phoneNumber, code);
-             return resultResponse(HaoBanErrCode.ERR_21);
-        }else{
-        	return resultResponse(HaoBanErrCode.ERR_1);
+        boolean b = CheckSmsCodeUtil.checkSmsCode(nationcode + "-" + phoneNumber, code, type);
+
+        boolean c = CheckSmsCodeUtil.checkSmsCodeIsDelay(nationcode + "-" + phoneNumber, code, type);
+        if (!c) {
+            logger.info("phoneNumber:{},code:{} 验证失败，验证码失效", nationcode + "-" + phoneNumber, code);
+            return resultResponse(HaoBanErrCode.ERR_21);
+        } else if (!b) {
+            logger.info("phoneNumber:{},code:{} 验证失败，验证码失败", nationcode + "-" + phoneNumber, code);
+            return resultResponse(HaoBanErrCode.ERR_21);
+        } else {
+            return resultResponse(HaoBanErrCode.ERR_1);
         }
     }