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

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

Browse Source
This commit is contained in:
zhangchenbiao
2024-04-16 17:09:03 +08:00
parent bc0cc2155c 27a5e56000
commit fca4c05bac
3 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-common/src/main/java/com/cool/store/utils/RedisConstantUtil.java
View File

@@ -103,8 +103,8 @@ public class RedisConstantUtil {
return active + "_" + RedisConstant.USER_WANT_AREA_CACHE + eid + ":" + userId; return active + "_" + RedisConstant.USER_WANT_AREA_CACHE + eid + ":" + userId;
} }
public String getInvestmentManagerKey(Long wantShopAreaId) { public String getInvestmentManagerKey(Long wantShopAreaId, Long roleId) {
return active + "_" + RedisConstant.INVESTMENT_MANAGER_CACHE + eid + ":" + wantShopAreaId; return active + "_" + RedisConstant.INVESTMENT_MANAGER_CACHE + eid + ":" + wantShopAreaId + ":" + roleId ;
} }
} }

2
coolstore-partner-model/src/main/java/com/cool/store/request/InitiatingRequest.java
View File

@@ -101,6 +101,8 @@ public class InitiatingRequest {
private String jm_csgs; private String jm_csgs;
private String csfzName;
public InitiatingDO toInitiatingDO() { public InitiatingDO toInitiatingDO() {
InitiatingDO initiatingDO = new InitiatingDO(); InitiatingDO initiatingDO = new InitiatingDO();

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

@@ -77,14 +77,11 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService {
if(Objects.isNull(userRoleEnum) || Objects.isNull(wantShopAreaId)){ if(Objects.isNull(userRoleEnum) || Objects.isNull(wantShopAreaId)){
return null; return null;
} }
String suitableUserId = null; String investmentManagerKey = redisConstantUtil.getInvestmentManagerKey(wantShopAreaId, userRoleEnum.getCode());
String investmentManagerKey = redisConstantUtil.getInvestmentManagerKey(wantShopAreaId); String suitableUserId = redisUtilPool.rpopStr(investmentManagerKey);
if(UserRoleEnum.INVESTMENT_MANAGER.equals(userRoleEnum)){ if(StringUtils.isNotBlank(suitableUserId)){
suitableUserId = redisUtilPool.rpopStr(investmentManagerKey); EnterpriseUserDO userDO = enterpriseUserDAO.getUserInfoById(suitableUserId);
if(StringUtils.isNotBlank(suitableUserId)){ return userDO;
EnterpriseUserDO userDO = enterpriseUserDAO.getUserInfoById(suitableUserId);
return userDO;
}
} }
Long warRegionId = regionAreaConfigDao.getByWantShopAreaId(wantShopAreaId); Long warRegionId = regionAreaConfigDao.getByWantShopAreaId(wantShopAreaId);
if(warRegionId == null){ if(warRegionId == null){
@@ -104,16 +101,11 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService {
if(CollectionUtils.isEmpty(authWarRegionUserIdList)){ if(CollectionUtils.isEmpty(authWarRegionUserIdList)){
return fillDefaultUser(userRoleEnum); return fillDefaultUser(userRoleEnum);
} }
if(UserRoleEnum.INVESTMENT_MANAGER.equals(userRoleEnum)){ authWarRegionUserIdList = authWarRegionUserIdList.stream()
// 按工号排序后放入redis .sorted((a, b) -> b.compareTo(a))
authWarRegionUserIdList = authWarRegionUserIdList.stream() .collect(Collectors.toList());
.sorted((a, b) -> b.compareTo(a)) redisUtilPool.listPushTail(investmentManagerKey, authWarRegionUserIdList.toArray(new String[authWarRegionUserIdList.size()]));
.collect(Collectors.toList()); suitableUserId = redisUtilPool.rpopStr(investmentManagerKey);
redisUtilPool.listPushTail(investmentManagerKey, authWarRegionUserIdList.toArray(new String[authWarRegionUserIdList.size()]));
suitableUserId = redisUtilPool.rpopStr(investmentManagerKey);
}else {
suitableUserId = authWarRegionUserIdList.get(0);
}
EnterpriseUserDO userDO = enterpriseUserDAO.getUserInfoById(suitableUserId); EnterpriseUserDO userDO = enterpriseUserDAO.getUserInfoById(suitableUserId);
return userDO; return userDO;
} }