Merge branch 'master_xgh_待开发调整711' into 'developer'

无手机号伪登录

See merge request !180

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-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,7 +154,7 @@ 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);
@@ -228,13 +231,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
      *