suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

区分线上测试环境

Browse Source
This commit is contained in:
wangxiaopeng
2024-05-27 15:23:54 +08:00
parent e520d11358
commit aff8dca1c3
4 changed files with 56 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -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);

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

@@ -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;
}
}