招商经理—强加盟

coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java

@@ -152,9 +152,9 @@ public class CommonConstants {
 
     public static final Long LONG_ONE = 1L;
     // 线索选择的意向区域没有绑定战区，线索分配给【拓展经理胡德龙】
-    public static final String DEAULT_INVESTMENT_JOBNUMBER_ONLINE = "17021329";
+    public static final String DEAULT_INVESTMENT_JOBNUMBER_ONLINE = "wpayJeDAAAklx_q1jGhyGUd4yEh8vV_g_woayJeDAAAONg82B29gnktdL1Cnab7VA";
     public static final String DEAULT_INVESTMENT_JOBNUMBER_TEST = "23483622251259165";
-    public static final String DEAULT_SELECT_SITE_MANAGER_ONLINE = "09080211";
+    public static final String DEAULT_SELECT_SITE_MANAGER_ONLINE = "wpayJeDAAAklx_q1jGhyGUd4yEh8vV_g_woayJeDAAAONg82B29gnktdL1Cnab7VA";
     public static final String DEAULT_SELECT_SITE_MANAGER_TEST = "23483622251259165";
     // 【铺位1】所属战区没有战区经理、营运经理和大区经理，开店负责人展示【王磊】
     public static final String DEAULT_SHOP_MANAGER_USER_ID_ONLINE = "19060164";

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

@@ -29,6 +29,7 @@ public enum UserRoleEnum {
     DESIGN_MANAGER(240000000L, "品牌设计高级经理"),
     ENGINEER_DEP_SUPERVISOR(250000000L, "工程部监理"),
     ENGINEER_DEP_MANAGER(260000000L, "工程部高级经理"),
+    STRONG_INVESTMENT_COMMISSIONER(270000000L, "强加盟招商专员"),
     ;
 
     private Long code;

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

@@ -93,7 +93,7 @@ public interface LineService {
      * @param addLineRequest
      * @return
      */
-    Boolean addLine(AddLineRequest addLineRequest) ;
+    Boolean addLine(AddLineRequest addLineRequest,LoginUserInfo userInfo) ;
 
     String getPayPicByLineId(Long lineId);
 

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

@@ -423,7 +423,7 @@ public class LineServiceImpl implements LineService {
 
 
     @Override
-    public Boolean addLine(AddLineRequest addLineRequest) {
+    public Boolean addLine(AddLineRequest addLineRequest,LoginUserInfo userInfo) {
         //必填参数
         log.info("addLine:{}", JSONObject.toJSONString(addLineRequest));
         if (!StringUtil.isNoneBlank(addLineRequest.getMobile(),addLineRequest.getUserName())){
@@ -449,23 +449,37 @@ public class LineServiceImpl implements LineService {
         lineInfoDO.setUsername(addLineRequest.getUserName());
         lineInfoDO.setLineSource(Integer.valueOf(UserChannelEnum.ADD.getCode()));
         lineInfoDO.setPartnerId(hyPartnerUserInfoDO.getPartnerId());
-        String userId = null;
-        if (StringUtils.isNotBlank(addLineRequest.getInvestmentManagerUserId())){
-            userId = addLineRequest.getInvestmentManagerUserId();
-        }else {
-            //督导角色是招商专员
-            EnterpriseUserDO user = userAuthMappingService.getUserByRoleEnumAndWantShopAreaId(UserRoleEnum.SUPERVISION, addLineRequest.getWantShopAreaId());
-            userId = user.getUserId();
-        }
         Long regionId = regionAreaConfigDao.getByWantShopAreaId(addLineRequest.getWantShopAreaId());
         lineInfoDO.setRegionId(regionId);
-        lineInfoDO.setInvestmentManager(userId);
+        lineInfoDO.setInvestmentManager(getInvestmentManagerUserId(addLineRequest));
-        lineInfoDO.setCreateUserId(userId);
+        lineInfoDO.setCreateUserId(userInfo.getUserId());
-        lineInfoDO.setUpdateUserId(userId);
+        lineInfoDO.setUpdateUserId(userInfo.getUserId());
         lineInfoDAO.insertOrUpdate(lineInfoDO);
         return Boolean.TRUE;
     }
 
+    /**
+     * 获取招商经理id
+     * @param addLineRequest
+     * @return
+     */
+    private String getInvestmentManagerUserId(AddLineRequest addLineRequest){
+        //如果选择了招商经理 直接使用该招商经理
+        if (StringUtils.isNotBlank(addLineRequest.getInvestmentManagerUserId())){
+            return addLineRequest.getInvestmentManagerUserId();
+        }
+        //如果是强加盟 使用强加盟督导跟进线索
+        UserRoleEnum userRoleEnum = UserRoleEnum.SUPERVISION;
+        if (CommonConstants.TWO==addLineRequest.getJoinMode()){
+            userRoleEnum = UserRoleEnum.STRONG_INVESTMENT_COMMISSIONER;
+        }
+        EnterpriseUserDO user = userAuthMappingService.getUserByRoleEnumAndWantShopAreaId(userRoleEnum, addLineRequest.getWantShopAreaId());
+        return user.getUserId();
+    }
+
+
+
+
     @Override
     public String getPayPicByLineId(Long lineId) {
         LineInfoDO lineInfo = lineInfoDAO.getLineInfo(lineId);

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

@@ -393,7 +393,7 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService {
     private String getDefaultJobnumber(UserRoleEnum userRoleEnum) {
         Boolean isOnline = active.equals(CommonConstants.HD_ENV) || active.equals(CommonConstants.ONLINE_ENV);
         // 如果找不到招商专员，则分配给默认的招商经理
-        if (UserRoleEnum.INVESTMENT_COMMISSIONER.equals(userRoleEnum)) {
+        if (UserRoleEnum.INVESTMENT_COMMISSIONER.equals(userRoleEnum)|| UserRoleEnum.STRONG_INVESTMENT_COMMISSIONER.equals(userRoleEnum)) {
             return  isOnline ? CommonConstants.DEAULT_INVESTMENT_JOBNUMBER_ONLINE : CommonConstants.DEAULT_INVESTMENT_JOBNUMBER_TEST;
         } else if (UserRoleEnum.SELECT_SITE_COMMISSIONER.equals(userRoleEnum)) {
             // 如果找不到选址专员，则分配给默认的选址经理

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

@@ -143,7 +143,7 @@ public class LineInfoController {
     @ApiOperation("新建线索")
     @PostMapping("/addLine")
     public ResponseResult<Boolean> addLine(@RequestBody AddLineRequest addLineRequest) {
-        return ResponseResult.success(lineService.addLine(addLineRequest));
+        return ResponseResult.success(lineService.addLine(addLineRequest,CurrentUserHolder.getUser()));
     }