Merge remote-tracking branch 'xfsg/cc_partner_init' into cc_partner_init

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

@@ -148,13 +148,13 @@ public class CommonConstants {
 
     public static final Long LONG_ONE = 1L;
     // 线索选择的意向区域没有绑定战区，线索分配给【拓展经理胡德龙】
-    // public static final String DEAULT_INVESTMENT_JOBNUMBER = "17021329";
+    public static final String DEAULT_INVESTMENT_JOBNUMBER_ONLINE = "17021329";
-    public static final String DEAULT_INVESTMENT_JOBNUMBER = "23483622251259165";
+    public static final String DEAULT_INVESTMENT_JOBNUMBER_TEST = "23483622251259165";
-    // public static final String DEAULT_SELECT_SITE_MANAGER = "09080211";
+    public static final String DEAULT_SELECT_SITE_MANAGER_ONLINE = "09080211";
-    public static final String DEAULT_SELECT_SITE_MANAGER = "23483622251259165";
+    public static final String DEAULT_SELECT_SITE_MANAGER_TEST = "23483622251259165";
     // 【铺位1】所属战区没有战区经理、营运经理和大区经理，开店负责人展示【王磊】
-    // public static final String DEAULT_SHOP_MANAGER_USER_ID = "19060164";
+    public static final String DEAULT_SHOP_MANAGER_USER_ID_ONLINE = "19060164";
-    public static final String DEAULT_SHOP_MANAGER_USER_ID = "23483622251259165";
+    public static final String DEAULT_SHOP_MANAGER_USER_ID_TEST = "23483622251259165";
     public static final int MAX_LENGTH_ONE_HUNDRED = 100;
 
     public static final String YUN_XUE_TANG_SUC_CODE = "10000";
@@ -183,4 +183,7 @@ public class CommonConstants {
      */
     public  static final String SUCCESS_STR = "success";
 
+    public static final String HD_ENV = "hd";
+    public static final String ONLINE_ENV = "online";
+
 }

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

@@ -74,4 +74,11 @@ public interface UserAuthMappingService {
      */
     List<Long> listWantShopAreaIdByUserId(String userId);
 
+    /**
+     * 【铺位1】所属战区没有战区经理、营运经理和大区经理，开店负责人展示【王磊】
+     * @return
+     */
+    String getShopManagerUserId();
+
+
 }

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

@@ -962,7 +962,7 @@ public class PointServiceImpl implements PointService {
             List<UserRoleEnum> roleList = Arrays.asList(UserRoleEnum.THEATER_MANAGER, UserRoleEnum.OPERATIONS_MANAGER, UserRoleEnum.REGION_MANAGER);
             String shopManagerUserId = sysRoleService.getUserIdByRegionIdWithRolePriority(shopInfo.getRegionId(), roleList);
             if(StringUtils.isBlank(shopManagerUserId)){
-                shopManagerUserId = CommonConstants.DEAULT_SHOP_MANAGER_USER_ID;
+                shopManagerUserId = userAuthMappingService.getShopManagerUserId();
             }
             updateShop.setShopManagerUserId(shopManagerUserId);
             shopInfoDAO.updateShopInfo(updateShop);

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

@@ -21,6 +21,7 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.ListUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -58,6 +59,9 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService {
     @Autowired
     private RedisConstantUtil redisConstantUtil;
 
+    @Value("${spring.profiles.active}")
+    private String active;
+
     @Override
     public List<UserAuthMappingDO> listUserAuthMappingByUserId(String userId) {
         if (StringUtils.isBlank(userId)) {
@@ -194,18 +198,19 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService {
     }
 
     private EnterpriseUserDO fillDefaultUser(UserRoleEnum userRoleEnum) {
+        String defaultJobnumber = getDefaultJobnumber(userRoleEnum);
         // 如果找不到招商专员，则分配给默认的招商经理
         if (UserRoleEnum.INVESTMENT_COMMISSIONER.equals(userRoleEnum)) {
-            EnterpriseUserDO defaultUser = enterpriseUserDAO.getUserInfoByJobnumber(CommonConstants.DEAULT_INVESTMENT_JOBNUMBER);
+            EnterpriseUserDO defaultUser = enterpriseUserDAO.getUserInfoByJobnumber(defaultJobnumber);
             if (defaultUser == null) {
-                defaultUser = enterpriseUserDAO.getUserInfoById(CommonConstants.DEAULT_INVESTMENT_JOBNUMBER);
+                defaultUser = enterpriseUserDAO.getUserInfoById(defaultJobnumber);
             }
             return defaultUser;
         } else if (UserRoleEnum.SELECT_SITE_COMMISSIONER.equals(userRoleEnum)) {
             // 如果找不到选址专员，则分配给默认的选址经理
-            EnterpriseUserDO defaultUser = enterpriseUserDAO.getUserInfoByJobnumber(CommonConstants.DEAULT_SELECT_SITE_MANAGER);
+            EnterpriseUserDO defaultUser = enterpriseUserDAO.getUserInfoByJobnumber(defaultJobnumber);
             if (defaultUser == null) {
-                defaultUser = enterpriseUserDAO.getUserInfoById(CommonConstants.DEAULT_SELECT_SITE_MANAGER);
+                defaultUser = enterpriseUserDAO.getUserInfoById(defaultJobnumber);
             }
             return defaultUser;
         }
@@ -265,6 +270,16 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService {
         return wantShopAreaIdList;
     }
 
+    @Override
+    public String getShopManagerUserId() {
+        Boolean isOnline = active.equals(CommonConstants.HD_ENV) || active.equals(CommonConstants.ONLINE_ENV);
+        if(isOnline){
+            return  CommonConstants.DEAULT_SHOP_MANAGER_USER_ID_ONLINE;
+        }else {
+            return  CommonConstants.DEAULT_SHOP_MANAGER_USER_ID_TEST;
+        }
+    }
+
     // 查找有战区权限的人
     public List<String> authWarRegionUser(Long warRegionId) {
         List<String> result = new ArrayList<>();
@@ -353,5 +368,25 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService {
         return distinctUserIdList;
     }
 
+    private String getDefaultJobnumber(UserRoleEnum userRoleEnum) {
+        Boolean isOnline = active.equals(CommonConstants.HD_ENV) || active.equals(CommonConstants.ONLINE_ENV);
+        // 如果找不到招商专员，则分配给默认的招商经理
+        if (UserRoleEnum.INVESTMENT_COMMISSIONER.equals(userRoleEnum)) {
+            if(isOnline){
+                return  CommonConstants.DEAULT_INVESTMENT_JOBNUMBER_ONLINE;
+            }else {
+                return  CommonConstants.DEAULT_INVESTMENT_JOBNUMBER_TEST;
+            }
+        } else if (UserRoleEnum.SELECT_SITE_COMMISSIONER.equals(userRoleEnum)) {
+            // 如果找不到选址专员，则分配给默认的选址经理
+            if(isOnline){
+                return  CommonConstants.DEAULT_SELECT_SITE_MANAGER_ONLINE;
+            }else {
+                return  CommonConstants.DEAULT_SELECT_SITE_MANAGER_TEST;
+            }
+        }
+        return null;
+    }
+
 
 }