Merge remote-tracking branch 'origin/developer' into developer

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

@@ -1516,7 +1516,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             exsitDTO.setAddCreateTime(createTime);
             exsitDTO.setEnterpriseId(enterpriseId);
             exsitDTO.setExternalName(name);
-            exsitDTO.setExternalUserid(externalUserId);
+            exsitDTO.setSelfExternalUserid(dto.getSelfExternalUserId());
             exsitDTO.setWxEnterpriseId(wxEnterpriseId);
             exsitDTO.setWxUserId(wxUserId);
             exsitDTO.setUnionid(unionId);
@@ -1528,6 +1528,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             exsitDTO.setUnionid(unionId);
             exsitDTO.setAddCreateTime(createTime);
             exsitDTO.setExternalName(name);
+            exsitDTO.setSelfExternalUserid(dto.getSelfExternalUserId());
 
             memberUnionRelatedService.update(exsitDTO);
         }
@@ -1646,6 +1647,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             exsitDTO.setAvatar(avatar);
             exsitDTO.setExternalUserid(externalUserId);
             exsitDTO.setAddCreateTime(createTime);
+            exsitDTO.setSelfExternalUserid(dto.getSelfExternalUserId());
             exsitDTO.setExternalName(name);
 
             memberUnionRelatedService.update(exsitDTO);

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

@@ -37,7 +37,7 @@ private static Logger logger = LoggerFactory.getLogger(SendCodeController.class)
      */
     @RequestMapping("/send-code")
     public HaobanResponse sendCode(String phoneNumber, @RequestParam(defaultValue = "86") String nationcode,
-                                   Integer type, @RequestParam(defaultValue = "0") int isTest,String wxEnterpriseId) {
+                                   Integer type, @RequestParam(defaultValue = "0") int isTest, String enterpriseId) {
         if (StringUtils.isBlank(phoneNumber) || null == type) {
             logger.info("没有phoneNumber!");
             return resultResponse(HaoBanErrCode.ERR_5);
@@ -76,7 +76,7 @@ private static Logger logger = LoggerFactory.getLogger(SendCodeController.class)
         logger.info("{}-{} 的 验证码：{}",nationcode,phoneNumber, smsCode);
         //非测试
         if (isTest != 1) {
-            SendSmsResponse smsResponse = validationCodeService.sendValidationCode(nationcode,phoneNumber, smsCode);
+            SendSmsResponse smsResponse = validationCodeService.sendValidationCodeHb3(nationcode, phoneNumber, smsCode, enterpriseId, null, null, false);
             logger.info("{}-{} 的 验证码 发送结果回执：{}",nationcode,phoneNumber, JSON.toJSONString(smsResponse));
             if (!smsResponse.isSuccess()) {
                 HaobanResponse response = new HaobanResponse();

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

 package com.gic.haoban.manage.web.controller;
 
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.alibaba.fastjson.JSON;
+import com.gic.enterprise.api.dto.StoreDTO;
+import com.gic.enterprise.api.service.StoreService;
 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.dto.StaffDTO;
 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;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 public class SendCodeController extends WebBaseController{
@@ -30,6 +30,10 @@ public class SendCodeController extends WebBaseController{
 	
 	@Autowired
 	private ValidationCodeService validationCodeService;
+
+    @Autowired
+    private StoreService storeService;
+
     /**
      * 验证码发送
      *
@@ -38,7 +42,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) {
+                                   Integer type, @RequestParam(defaultValue = "0") int isTest, String wxEnterpriseId, String storeId, String clerkId) {
         if (StringUtils.isBlank(phoneNumber) || null == type) {
             logger.info("没有phoneNumber!");
             return resultResponse(HaoBanErrCode.ERR_5);
@@ -81,7 +85,13 @@ public class SendCodeController extends WebBaseController{
         logger.info("{}-{} 的 验证码：{}",nationcode,phoneNumber, smsCode);
         //非测试
         if (isTest != 1) {
-            SendSmsResponse smsResponse = validationCodeService.sendValidationCode(nationcode,phoneNumber, smsCode);
+            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();