Merge branch 'master-调整队列' into 'master'

Master 调整队列

See merge request !1488

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffClerkRelationApiServiceImpl.java

@@ -303,17 +303,18 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
     @Override
     public ServiceResponse wxBindStaffClerk(StaffClerkRelationDTO staffClerkRelation, String optStaffId, int channelCode) {
         Integer manageFlag = staffClerkRelation.getManageFlag();
-        if (manageFlag != null && manageFlag == 1) {
+        if (manageFlag != null && manageFlag.intValue() == 1) {
             ServiceResponse serviceResponse = getManageFlagBind(staffClerkRelation);
             if (!serviceResponse.isSuccess()) {
                 return serviceResponse;
             }
-        }
-        String staffId = staffClerkRelation.getStaffId();
-        List<StaffClerkRelationDTO> staffClerkRelationDTOS = staffClerkRelationService.listManageBindByStaffId(staffId);
-        if (CollectionUtils.isNotEmpty(staffClerkRelationDTOS)) {
-            logger.info("该导购已绑定区经，不允许绑定导购");
-            return ServiceResponse.failure("3", "该导购已绑定区经，不允许绑定导购");
+        }else {
+            String staffId = staffClerkRelation.getStaffId();
+            List<StaffClerkRelationDTO> staffClerkRelationDTOS = staffClerkRelationService.listManageBindByStaffId(staffId);
+            if (CollectionUtils.isNotEmpty(staffClerkRelationDTOS)) {
+                logger.info("该导购已绑定区经，不允许绑定导购");
+                return ServiceResponse.failure("3", "该导购已绑定区经，不允许绑定导购");
+            }
         }
         if (StringUtils.isNotBlank(staffClerkRelation.getStaffClerkRelationId())) {
             TabHaobanStaffClerkRelation oldStaffClerkRelation = tabHaobanStaffClerkRelationMapper.selectByPrimaryKey(staffClerkRelation.getStaffClerkRelationId());

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.enterprise.api.dto.StoreDTO;
+import com.gic.clerk.api.dto.ClerkDTO;
+import com.gic.clerk.api.service.ClerkService;
 import com.gic.enterprise.api.service.StoreService;
 import com.gic.haoban.common.utils.CheckSmsCodeUtil;
 import com.gic.haoban.common.utils.GooglePhoneNumberUtil;
@@ -24,9 +25,8 @@ public class SendCodeController extends WebBaseController {
 
     @Autowired
     private ValidationCodeApiService validationCodeService;
-
     @Autowired
-    private StoreService storeService;
+    private ClerkService clerkService ;
 
     /**
      * 验证码发送
@@ -36,7 +36,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 +70,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);
+
     }
 
     /**

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

@@ -937,7 +937,7 @@ public class WxStaffController extends WebBaseController {
         }
         String storeId = "";
         String storeName = "";
-        if (manageFlag != null && manageFlag == 1) {
+        if (manageFlag != null && manageFlag.intValue() == 1) {
             // 区经无门店
         } else {
             storeId = clerk.getStoreId();