Merge branch 'master_xgh_待开发调整711' into 'master_xgh_停用功能'

Master xgh 待开发调整711

See merge request !196

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/SecretTypeEnum.java

@@ -5,7 +5,9 @@ package com.gic.haoban.manage.api.enums;
  */
 public enum SecretTypeEnum {
     CONTACT_CUSTOMER(1, "顾客联系"),
+    // 2和3废弃
     CONTACT_SECRET(2, "通讯录"),
+    // 3和5公用
     HAOBAN_HELP(3, "好办助手"),
     MEMBER_WAPP(4, "会员小程序"),
     CUSTOMIZED_APP(5, "自建代开发"),

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/test/TestController.java

@@ -91,7 +91,7 @@ public class TestController extends WebBaseController {
 
 
     /**
-     * 创建定时器
+     * 删除定时器
      *
      * @return
      */

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

@@ -321,11 +321,15 @@ public class StaffApiServiceImpl implements StaffApiService {
             res.setCode(3);
             return res;
         }
+        String nationCode = null ;
+        String phoneNumber = null;
         String imageUrl = changeHeaderImageUrl(user.getAvatar());
         String mobile = user.getMobile();
-        String[] arr = getNationCodeAndPhoneNumber(mobile);
-        String nationCode = arr[0];
-        String phoneNumber = arr[1];
+        if(StringUtils.isNotBlank(mobile)) {
+            String[] arr = getNationCodeAndPhoneNumber(mobile);
+            nationCode = arr[0];
+            phoneNumber = arr[1];
+        }
         TabHaobanStaff staff = staffService.selectByPhoneNumberOrUserIdAndEnterpriseId(phoneNumber, userId, wxEnterpriseId);
         if (staff != null) {
             staffService.delOtherStaffByWxUserId(staff.getWxUserId(), staff.getStaffId(), wxEnterpriseId);

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

@@ -368,6 +368,7 @@ public class StaffController extends WebBaseController {
             logger.info("没有权限门店");
             return resultResponse(HaoBanErrCode.ERR_1);
         }
+        logger.info("好办门店数={},wxEnterpriseId={},enterpriseIds={}",storeIds.size(),wxEnterpriseId,enterpriseIds);
         List<ClerkDTO> clerkDTOList = clerkNewService.listClerkByEnterpriseIdAndSearchAndClerkType(enterpriseIds, storeIds, search);
         List<ClerkInfoVo> retList = EntityUtil.changeEntityListByJSON(ClerkInfoVo.class, clerkDTOList);
         if (CollectionUtils.isNotEmpty(retList)) {

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

@@ -135,11 +135,14 @@ public class WxEnterpriseInfoController extends WebBaseController {
             return resultResponse(HaoBanErrCode.ERR_1, wellDoneLoginInfoVo);
         }
 
-        if (StringUtils.isNotBlank(loginStaff.getPhoneNumber())) {
-            DictDTO loginUserId = managerDictService.getSMSDict("app_login_phone_num", loginStaff.getPhoneNumber());
-            logger.info("伪登录：{}，userId:{}", loginStaff.getPhoneNumber(), JSONObject.toJSONString(loginUserId));
-            if (null != loginUserId) {
-                String dictValue = loginUserId.getDictValue();
+        if (StringUtils.isNotBlank(loginStaff.getPhoneNumber()) || StringUtils.isNotBlank(loginStaff.getWxOpenUseId())) {
+            DictDTO loginUserDict = managerDictService.getSMSDict("app_login_phone_num", loginStaff.getPhoneNumber());
+            if(null == loginUserDict) {
+                loginUserDict = managerDictService.getSMSDict("app_login_phone_num", loginStaff.getWxOpenUseId());
+            }
+            logger.info("伪登录：{}userId:{},loginUser={}", loginStaff.getPhoneNumber(),loginStaff.getWxOpenUseId(), JSONObject.toJSONString(loginUserDict));
+            if (null != loginUserDict) {
+                String dictValue = loginUserDict.getDictValue();
                 List<StaffDTO> staffDTOS = new ArrayList<>();
                 List<StaffDTO> phoneDtos = staffApiService.listByPhoneNumber(dictValue);
                 List<StaffDTO> userDtos = staffApiService.listByWxUserId(dictValue,loginStaff.getWxEnterpriseId());
@@ -151,11 +154,13 @@ public class WxEnterpriseInfoController extends WebBaseController {
                 }
                 if (CollectionUtils.isNotEmpty(staffDTOS)) {
                     if (staffDTOS.size() > 1) {
-                        String dictName = loginUserId.getDictName();
+                        String dictName = loginUserDict.getDictName();
                         loginStaff = staffDTOS.stream().filter(staffDTO -> dictName.indexOf(staffDTO.getWxEnterpriseId()) > 0).findFirst().orElse(loginStaff);
                     } else {
                         loginStaff = staffDTOS.get(0);
                     }
+                }else {
+                    logger.info("伪登录关联用户查不到,user={}",dictValue);
                 }
             }
         }
@@ -228,13 +233,6 @@ public class WxEnterpriseInfoController extends WebBaseController {
     }
 
 
-    private RestResponse<String> getRefreshTokenResult(String refreshToken) {
-        if (StringUtils.isBlank(refreshToken)) {
-            return RestResponse.failure(String.valueOf(HaoBanErrCode.ERR_30010.getCode()), HaoBanErrCode.ERR_30010.getMsg());
-        }
-        return RestResponse.successResult(refreshToken);
-    }
-
     /**
      * 刷新token
      *
@@ -267,7 +265,7 @@ public class WxEnterpriseInfoController extends WebBaseController {
 
         String phoneNumber = staffDTO.getPhoneNumber();
         if (StringUtils.isBlank(phoneNumber)) {
-            return RestResponse.failure(String.valueOf(HaoBanErrCode.ERR_600002.getCode()), HaoBanErrCode.ERR_600002.getMsg());
+            //return RestResponse.failure(String.valueOf(HaoBanErrCode.ERR_600002.getCode()), HaoBanErrCode.ERR_600002.getMsg());
         }
 
         Map<String, String> map = new HashMap<>();