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

Merge remote-tracking branch 'origin/cc_20240605_feat' into cc_20240603_wantarea_bigregion

Browse Source
This commit is contained in:
苏竹红
2024-06-05 21:15:04 +08:00
parent 4d89bb96fa 04d8b808cb
commit dca48c988e
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -165,7 +165,7 @@ public class FirstOrderServiceImp implements FirstOrderService {
} }
ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(shopId); ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(shopId);
EnterpriseUserDO userInfoById = enterpriseUserDAO.getUserInfoById(shopInfo.getSupervisorUserId()); EnterpriseUserDO userInfoById = enterpriseUserDAO.getUserInfoById(shopInfo.getSupervisorUserId());
order.setSubmiter(userInfoById.getName()+"_"+userInfoById.getJobnumber()); order.setSubmiter(Objects.isNull(userInfoById) ? null : userInfoById.getName()+"_"+userInfoById.getJobnumber());
return order; return order;
} }
} }

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

@@ -116,14 +116,20 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService {
OpeningOperationPlanDO openingOperationPlanDO = openingOperationPlanDAO.selectByShopId(shopId); OpeningOperationPlanDO openingOperationPlanDO = openingOperationPlanDAO.selectByShopId(shopId);
EnterpriseUserDO userInfoById = enterpriseUserDAO.getUserInfoById(shopInfo.getSupervisorUserId()); EnterpriseUserDO userInfoById = enterpriseUserDAO.getUserInfoById(shopInfo.getSupervisorUserId());
List<EnterpriseUserDO> allUserByRoleEnumAndRegionId = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.OPERATIONS_MANAGER, shopInfo.getRegionId()); List<EnterpriseUserDO> allUserByRoleEnumAndRegionId = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.OPERATIONS_MANAGER, shopInfo.getRegionId());
List<String> collect = allUserByRoleEnumAndRegionId.stream() List<String> collect = new ArrayList<>();
.filter(user -> user.getName() != null) if (CollectionUtils.isEmpty(allUserByRoleEnumAndRegionId)){
.map(user -> user.getName() + "_" + user.getJobnumber()) collect = null;
.collect(Collectors.toList()); }else {
collect = allUserByRoleEnumAndRegionId.stream()
.filter(user -> user.getName() != null)
.map(user -> user.getName() + "_" + user.getJobnumber())
.collect(Collectors.toList());
}
if (Objects.nonNull(openingOperationPlanDO)) { if (Objects.nonNull(openingOperationPlanDO)) {
openingOperationPlanVO = new OpeningOperationPlanVO(openingOperationPlanDO); openingOperationPlanVO = new OpeningOperationPlanVO(openingOperationPlanDO);
openingOperationPlanVO.setSubmiter(userInfoById.getName()+"_"+userInfoById.getJobnumber()); openingOperationPlanVO.setSubmiter(Objects.isNull(userInfoById) ? null : userInfoById.getName()+"_"+userInfoById.getJobnumber());
openingOperationPlanVO.setApprover(collect.stream().collect(Collectors.joining(","))); openingOperationPlanVO.setApprover(CollectionUtils.isEmpty(collect) ? null : collect.stream().collect(Collectors.joining(",")));
String preparationUserIds = openingOperationPlanDO.getPreparationUserIds(); String preparationUserIds = openingOperationPlanDO.getPreparationUserIds();
List<String> stream = Arrays.stream(preparationUserIds.split(CommonConstants.COMMA)).collect(Collectors.toList()); List<String> stream = Arrays.stream(preparationUserIds.split(CommonConstants.COMMA)).collect(Collectors.toList());
List<UserNameDTO> nameByUserId = enterpriseUserDAO.getNameByUserId(stream); List<UserNameDTO> nameByUserId = enterpriseUserDAO.getNameByUserId(stream);
@@ -133,8 +139,8 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService {
openingOperationPlanVO.setShopName(shopInfo.getShopName()); openingOperationPlanVO.setShopName(shopInfo.getShopName());
return openingOperationPlanVO; return openingOperationPlanVO;
} }
openingOperationPlanVO.setSubmiter(userInfoById.getName()+"_"+userInfoById.getJobnumber()); openingOperationPlanVO.setSubmiter(Objects.isNull(userInfoById) ? null : userInfoById.getName()+"_"+userInfoById.getJobnumber());
openingOperationPlanVO.setApprover(collect.stream().collect(Collectors.joining(","))); openingOperationPlanVO.setApprover(CollectionUtils.isEmpty(collect) ? null : collect.stream().collect(Collectors.joining(",")));
return openingOperationPlanVO; return openingOperationPlanVO;
} }

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

@@ -939,7 +939,7 @@ public class PointServiceImpl implements PointService {
ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(rentContract.getShopId()); ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(rentContract.getShopId());
LineInfoDO lineInfo = lineInfoDAO.getLineInfo(shopInfo.getLineId()); LineInfoDO lineInfo = lineInfoDAO.getLineInfo(shopInfo.getLineId());
EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.getUserInfoById(lineInfo.getDevelopmentManager()); EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.getUserInfoById(lineInfo.getDevelopmentManager());
result.setApprover(enterpriseUserDO.getName()+"_"+enterpriseUserDO.getJobnumber()); result.setApprover(Objects.isNull(enterpriseUserDO) ? null : enterpriseUserDO.getName()+"_"+enterpriseUserDO.getJobnumber());
return result; return result;
} }