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

处理多品牌

Browse Source
This commit is contained in:
shuo.wang
2024-11-04 15:16:43 +08:00
parent 9b6f73e615
commit d728c91628
5 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,4 +26,6 @@ public class AddLineRequest {
private Integer joinMode;
private String investmentManagerUserId;
private Long regionId;
}

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

@@ -132,15 +132,17 @@ public class LineServiceImpl implements LineService {
@Override
public PageInfo<LineListVO> getLineList(LineListRequest lineListRequest, LoginUserInfo loginUserInfo,Boolean teamFlag) {
List<Long> wantShopAreaIds = new ArrayList<>();
List<Long> regionId = new ArrayList<>();
String userId = null;
if(!teamFlag){
userId = loginUserInfo.getUserId();
}
if (teamFlag && !sysRoleService.checkIsAdmin(loginUserInfo.getUserId())){
List<Long> list = userAuthMappingService.listWantShopAreaIdByUserId(loginUserInfo.getUserId());
List<String> list = userAuthMappingService.getAuthRegionIdAndSubRegionIdByUserId(loginUserInfo.getUserId());
if (CollectionUtils.isNotEmpty(list)){
wantShopAreaIds = list;
for (String s : list){
regionId.add(Long.valueOf(s));
}
}else {
userId = loginUserInfo.getUserId();
}
@@ -151,7 +153,7 @@ public class LineServiceImpl implements LineService {
areaName = hyOpenAreaInfoDO.getAreaPath();
}
PageHelper.startPage(lineListRequest.getPageNum(), lineListRequest.getPageSize());
List<LineInfoDO> lineInfoDOS = lineInfoDAO.lineList(lineListRequest,areaName, userId, wantShopAreaIds);
List<LineInfoDO> lineInfoDOS = lineInfoDAO.lineList(lineListRequest,areaName, userId, regionId);
PageInfo page = new PageInfo(lineInfoDOS);
Map<Long, HyPartnerLabelDO> userPortraitMap = deskService.getUserPortraitMap(lineInfoDOS);
List<Long> wantShopAreaIdList = lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getWantShopAreaId() != null).map(LineInfoDO::getWantShopAreaId).collect(Collectors.toList());
@@ -436,10 +438,11 @@ public class LineServiceImpl implements LineService {
lineInfoDO.setUsername(addLineRequest.getUserName());
lineInfoDO.setLineSource(Integer.valueOf(UserChannelEnum.ADD.getCode()));
lineInfoDO.setPartnerId(hyPartnerUserInfoDO.getPartnerId());
if (addLineRequest.getJoinMode()==1){
Long regionId = regionAreaConfigDao.getByWantShopAreaId(addLineRequest.getWantShopAreaId());
lineInfoDO.setRegionId(regionId);
}
// if (addLineRequest.getJoinMode()==1){
// Long regionId = regionAreaConfigDao.getByWantShopAreaId(addLineRequest.getWantShopAreaId());
// lineInfoDO.setRegionId(regionId);
// }
lineInfoDO.setRegionId(addLineRequest.getRegionId());
lineInfoDO.setInvestmentManager(getInvestmentManagerUserId(addLineRequest, userInfo));
lineInfoDO.setCreateUserId(userInfo.getUserId());
lineInfoDO.setUpdateUserId(userInfo.getUserId());
@@ -461,7 +464,8 @@ public class LineServiceImpl implements LineService {
if (CommonConstants.TWO==addLineRequest.getJoinMode()){
return userInfo.getUserId();
}
EnterpriseUserDO user = userAuthMappingService.getUserByRoleEnumAndWantShopAreaId(UserRoleEnum.SUPERVISION, addLineRequest.getWantShopAreaId());
//zxjp改为直接用regionId
EnterpriseUserDO user = userAuthMappingService.getUserByRoleEnumAndWantShopAreaId(UserRoleEnum.SUPERVISION, addLineRequest.getRegionId());
return user.getUserId();
}

1
coolstore-partner-service/src/main/java/com/cool/store/service/impl/OperationLogServiceImpl.java
View File

@@ -64,6 +64,7 @@ public class OperationLogServiceImpl implements OperationLogService {
calendar.add(Calendar.SECOND, 1);
Date date = calendar.getTime();
if(CollectionUtils.isEmpty(operationUserList)){
operationUserList = new ArrayList<>();
operationUserList.addAll(enterpriseUserDAO.getUserInfoByUserIds(enterpriseUserRoleDao.selectUserIdsByRole(Role.MASTER))) ;
}
for (EnterpriseUserDO operationUser : operationUserList) {

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

@@ -120,12 +120,12 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService {
EnterpriseUserDO userDO = enterpriseUserDAO.getUserInfoById(suitableUserId);
return userDO;
}
Long warRegionId = regionAreaConfigDao.getByWantShopAreaId(wantShopAreaId);
if (warRegionId == null) {
return fillDefaultUser(userRoleEnum);
}
// Long warRegionId = regionAreaConfigDao.getByWantShopAreaId(wantShopAreaId);
// if (warRegionId == null) {
// return fillDefaultUser(userRoleEnum);
// }
// 查找有战区权限的人
List<String> authWarRegionUserIdList = authWarRegionUser(warRegionId);
List<String> authWarRegionUserIdList = authWarRegionUser(wantShopAreaId);
if (CollectionUtils.isEmpty(authWarRegionUserIdList)) {
return fillDefaultUser(userRoleEnum);
}

2
coolstore-partner-web/src/main/resources/application-test.properties
View File

@@ -59,7 +59,7 @@ fixMobileOpenid=HSAY5531DA7
xxl.job.admin.addresses = http://10.7.53.224:10001/xxl-job-admin
xxl.job.executor.appname = ${spring.application.name}
xxl.job.executor.ip =
xxl.job.executor.port = 40001
xxl.job.executor.port = 40301
xxl.job.executor.logpath = logs/xxl-job/jobhandler
xxl.job.executor.logretentiondays = 30
xxl.job.accessToken = 25365115eed84e9ba5e0040abb255a09