getUserByRoleEnumAndAreaId

coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java

@@ -1,5 +1,10 @@
 package com.cool.store.enums;
 
+import java.util.Arrays;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
 /**
  * @author zhangchenbiao
  * @FileName: UserRoleEnum
@@ -17,6 +22,9 @@ public enum UserRoleEnum {
     private Integer code;
     private String desc;
 
+    protected static final Map<String, UserRoleEnum> map = Arrays.stream(values()).collect(
+            Collectors.toMap(UserRoleEnum::getDesc, Function.identity()));
+
     UserRoleEnum(Integer code, String desc) {
         this.code = code;
         this.desc = desc;
@@ -29,4 +37,8 @@ public enum UserRoleEnum {
     public String getDesc() {
         return desc;
     }
+
+    public static UserRoleEnum getByDesc(String desc) {
+        return map.get(desc);
+    }
 }

coolstore-partner-service/src/main/java/com/cool/store/service/UserAuthMappingService.java

@@ -2,6 +2,7 @@ package com.cool.store.service;
 
 import com.cool.store.entity.EnterpriseUserDO;
 import com.cool.store.entity.UserAuthMappingDO;
+import com.cool.store.enums.UserRoleEnum;
 
 import java.util.List;
 import java.util.Map;
@@ -23,11 +24,11 @@ public interface UserAuthMappingService {
 
     /**
      * 提供 根据职位 意向区域  查  对应人的接口  同时返回人名字
-     * @param roleName
+     * @param userRoleEnum
      * @param wantShopAreaId
      * @return
      */
-    EnterpriseUserDO getUserByRoleNameAndAreaId(String roleName, Long wantShopAreaId);
+    EnterpriseUserDO getUserByRoleEnumAndAreaId(UserRoleEnum userRoleEnum, Long wantShopAreaId);
 
     /**
      * 跟进角色和战区获取用户id

coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java

@@ -67,7 +67,7 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt
             throw new ServiceException(ErrorCodeEnum.INTERVIEW_PARTNER_NOT_EXIST);
         }
         if (Objects.nonNull(request.getWantShopArea())){
-            EnterpriseUserDO userByRoleNameAndAreaId = userAuthMappingService.getUserByRoleNameAndAreaId("招商经理", Long.valueOf(request.getWantShopArea()));
+            EnterpriseUserDO userByRoleNameAndAreaId = userAuthMappingService.getUserByRoleEnumAndAreaId(UserRoleEnum.INVESTMENT_MANAGER, Long.valueOf(request.getWantShopArea()));
             lineInfoParam.setInvestmentManager(userByRoleNameAndAreaId.getUserId());
         }
         //todo 目前写死为进入私海

coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java

@@ -122,7 +122,7 @@ public class LineInterviewServiceImpl extends LineFlowService implements LineInt
         InterviewTypeEnum interviewType = WorkflowSubStageEnum.getInterviewType(lineInfo.getWorkflowSubStage());
         String interviewerUserId = lineInfo.getInvestmentManager(), firstInterviewer = null, secondInterviewer = null;
         if(!InterviewTypeEnum.MEET.equals(interviewType)){
-            EnterpriseUserDO enterpriseUser = userAuthMappingService.getUserByRoleNameAndAreaId("大区经理", lineInfo.getWantShopAreaId());
+            EnterpriseUserDO enterpriseUser = userAuthMappingService.getUserByRoleEnumAndAreaId(UserRoleEnum.REGION_MANAGER, lineInfo.getWantShopAreaId());
             interviewerUserId = Optional.ofNullable(enterpriseUser).map(EnterpriseUserDO::getUserId).orElse(null);
         }
         firstInterviewer = InterviewTypeEnum.INTERVIEW.equals(interviewType) ? interviewerUserId : null;

coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java

@@ -383,7 +383,7 @@ public class LineServiceImpl implements LineService {
         if (addLineRequest.getInvestmentManagerUserId()!=null){
             userId = addLineRequest.getInvestmentManagerUserId();
         }else {
-            EnterpriseUserDO user = userAuthMappingService.getUserByRoleNameAndAreaId(UserRoleEnum.INVESTMENT_MANAGER.getDesc(), addLineRequest.getWantShopAreaId());
+            EnterpriseUserDO user = userAuthMappingService.getUserByRoleEnumAndAreaId(UserRoleEnum.INVESTMENT_MANAGER, addLineRequest.getWantShopAreaId());
             userId = user.getUserId();
         }
         Long regionId = regionAreaConfigDao.getByWantShopAreaId(addLineRequest.getWantShopAreaId());

coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java

@@ -66,12 +66,13 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService {
 
     /**
      * 提供 根据职位 意向区域  查  对应人的接口  同时返回人名字
-     * @param roleName
+     * @param userRoleEnum
      * @param wantShopAreaId
      * @return
      */
     @Override
-    public EnterpriseUserDO getUserByRoleNameAndAreaId(String roleName, Long wantShopAreaId) {
+    public EnterpriseUserDO getUserByRoleEnumAndAreaId(UserRoleEnum userRoleEnum, Long wantShopAreaId) {
+        String roleName = userRoleEnum.getDesc();
         if(StringUtils.isBlank(roleName) || Objects.isNull(wantShopAreaId)){
             return null;
         }

coolstore-partner-web/src/main/java/com/cool/store/controller/webb/UserAuthMappingController.java

@@ -1,6 +1,7 @@
 package com.cool.store.controller.webb;
 
 import com.cool.store.entity.EnterpriseUserDO;
+import com.cool.store.enums.UserRoleEnum;
 import com.cool.store.response.ResponseResult;
 import com.cool.store.service.UserAuthMappingService;
 import io.swagger.annotations.Api;
@@ -33,7 +34,8 @@ public class UserAuthMappingController {
     @GetMapping("/getUserByRoleNameAndAreaId")
     public ResponseResult<EnterpriseUserDO> getUserByRoleNameAndAreaId(@RequestParam(value = "roleName", required = true) String roleName,
                                                                   @RequestParam(value = "wantShopAreaId", required = true) Long wantShopAreaId) {
-        return ResponseResult.success(userAuthMappingService.getUserByRoleNameAndAreaId(roleName, wantShopAreaId));
+        UserRoleEnum roleEnum = UserRoleEnum.getByDesc(roleName);
+        return ResponseResult.success(userAuthMappingService.getUserByRoleEnumAndAreaId(roleEnum, wantShopAreaId));
     }
 
     @ApiOperation("找意向区域")