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

1

Browse Source
This commit is contained in:
shuo.wang
2024-05-23 16:43:41 +08:00
parent 02e4afc5bb
commit 24a5d7b696
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java
View File

@@ -535,15 +535,12 @@ public class DecorationServiceImpl implements DecorationService {
fitmentCheckVO.setRegion(regionNameMap.get(regionId));
fitmentCheckVO.setFightManager(fightManger.get(regionId));
if (lineId != null) {
fitmentCheckVO.setInvestmentManagerId(lineInfoDOMap.get(lineId)
.getInvestmentManager());
fitmentCheckVO.setInvestmentManager(userNameMap.get(lineInfoDOMap.get(lineId)
.getInvestmentManager()));
fitmentCheckVO.setSitterId(lineInfoDOMap.get(lineId)
.getDevelopmentManager());
fitmentCheckVO.setSitterName(userNameMap.get(lineInfoDOMap.get(lineId)
.getDevelopmentManager()));
fitmentCheckVO.setPartnerName(lineInfoDOMap.get(lineId).getUsername());
LineInfoDO a = lineInfoDOMap.getOrDefault(lineId, new LineInfoDO());
fitmentCheckVO.setInvestmentManagerId(a.getInvestmentManager());
fitmentCheckVO.setInvestmentManager(a.getInvestmentManager());
fitmentCheckVO.setSitterId(a.getDevelopmentManager());
fitmentCheckVO.setSitterName(a.getDevelopmentManager());
fitmentCheckVO.setPartnerName(a.getUsername());
}
AcceptanceInfoDO acceptanceInfoDO = acceptanceInfoDOSMap.get(shopId);
if (shopId != null) {
@@ -555,7 +552,7 @@ public class DecorationServiceImpl implements DecorationService {
}
}
if (Objects.nonNull(ShopStageInfoDOMap.get(shopId))) {
fitmentCheckVO.setShopSubStageStatus(ShopStageInfoDOMap.get(shopId).getShopSubStageStatus());
fitmentCheckVO.setShopSubStageStatus(ShopStageInfoDOMap.getOrDefault(shopId,new ShopStageInfoDO()).getShopSubStageStatus());
}
fitmentCheckVOList.add(fitmentCheckVO);
}