From 555654e5c9b58088a9d252905faad7427a471726 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Mon, 24 Feb 2025 11:02:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=20=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E9=93=BA=E4=BD=8D=E5=8C=BA=E5=9F=9F=E5=92=8C=E9=80=89?= =?UTF-8?q?=E5=9D=80=E4=B8=93=E5=91=98=E9=94=99=E8=AF=AFbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/service/impl/PointServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java index a5d1be856..162838940 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java @@ -823,10 +823,11 @@ public class PointServiceImpl implements PointService { } PointDetailInfoDO pointDetailInfo = MiniAddPointRequest.convertDO(request); PointInfoDO pointInfo = MiniAddPointRequest.convertPointDO(request); - pointInfo.setRegionId(lineInfo.getRegionId()); + pointInfo.setRegionId(shopInfo.getRegionId()); pointInfo.setLineId(lineId); + pointInfo.setShopId(shopInfo.getId()); pointInfo.setSelectStatus(SelectStatusEnum.SELECT_STATUS_1.getCode()); - pointInfo.setDevelopmentManager(lineInfo.getDevelopmentManager()); + pointInfo.setDevelopmentManager(shopInfo.getDevelopmentManager()); pointInfo.setDevelopmentTime(new Date()); pointInfo.setPointSource(PointSourceEnum.POINT_SOURCE_2.getCode()); pointInfo.setPointCode(generateCode()); @@ -839,7 +840,7 @@ public class PointServiceImpl implements PointService { PointRecommendDO pointRecommendDO = new PointRecommendDO(); pointRecommendDO.setLineId(lineId); pointRecommendDO.setShopId(request.getShopId()); - pointRecommendDO.setDevelopmentManager(lineInfo.getDevelopmentManager()); + pointRecommendDO.setDevelopmentManager(shopInfo.getDevelopmentManager()); pointRecommendDO.setPointId(pointId); pointRecommendDO.setStatus(PointRecommendStatusEnum.POINT_RECOMMEND_STATUS_2.getCode()); //推荐列表新增 From c97c5ab5c2bc5bf95566dd42abe456b936762efa Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Mon, 24 Feb 2025 13:57:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=20=E9=80=89=E5=9D=80=E4=B8=93=E5=91=98?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/service/impl/LineServiceImpl.java | 25 ++++++++++++++++--- .../store/service/impl/PointServiceImpl.java | 4 +++ 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java index b7ffd2bbc..43a2d1ca4 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java @@ -103,13 +103,15 @@ public class LineServiceImpl implements LineService { List shopInfoDOS = shopInfoDAO.selectInvestmentByLines(Collections.singletonList(lineInfo.getId())); Set userIds = shopInfoDOS.stream().map(ShopInfoDO::getInvestmentManager).collect(Collectors.toSet()); + Set developmentMserIds = shopInfoDOS.stream().map(ShopInfoDO::getDevelopmentManager).collect(Collectors.toSet()); userIds.add(lineInfo.getInvestmentManager()); + userIds.addAll(developmentMserIds); Map userNameMap = enterpriseUserDAO.getUserNameMap(new ArrayList<>(userIds)); StringBuilder investmentManagerName = new StringBuilder(); - for (String userId : userNameMap.keySet()) { + for (String userId : userIds) { investmentManagerName.append(userNameMap.get(userId)).append(","); } - result.setInvestmentManagerName(investmentManagerName.toString().substring(0, investmentManagerName.length() - 1)); + result.setInvestmentManagerName(investmentManagerName.substring(0, investmentManagerName.length() - 1)); // if (StringUtil.isNotEmpty(lineInfo.getInvestmentManager())){ // EnterpriseUserDO user = enterpriseUserDAO.getUserInfoById(lineInfo.getInvestmentManager()); // result.setInvestmentManagerName(user.getName()); @@ -140,6 +142,11 @@ public class LineServiceImpl implements LineService { result.setJoinType(qualificationsInfoDO.getJoinType()); } BeanUtil.copyProperties(lineInfo, result); + StringBuilder developmentManagerName = new StringBuilder(); + for (String userId : developmentMserIds) { + developmentManagerName.append(userNameMap.get(userId)).append(","); + } + result.setDevelopmentManager(investmentManagerName.substring(0, investmentManagerName.length() - 1)); return result; } @@ -261,7 +268,10 @@ public class LineServiceImpl implements LineService { List lineIds = lineInfoDOS.stream().map(LineInfoDO::getId).collect(Collectors.toList()); List shopInfoDOS = shopInfoDAO.selectInvestmentByLines(lineIds); Map> investmentManagerIdMapByLineId = shopInfoDOS.stream().collect(Collectors.groupingBy(ShopInfoDO::getLineId, Collectors.mapping(ShopInfoDO::getInvestmentManager, Collectors.toSet()))); + Map> developmentManagerMap = shopInfoDOS.stream().collect(Collectors.groupingBy(ShopInfoDO::getLineId, Collectors.mapping(ShopInfoDO::getDevelopmentManager, Collectors.toSet()))); + Set investmentManagerIds = shopInfoDOS.stream().map(ShopInfoDO::getInvestmentManager).collect(Collectors.toSet()); + Set developmentManagerIds = shopInfoDOS.stream().map(ShopInfoDO::getInvestmentManager).collect(Collectors.toSet()); Map userPortraitMap = deskService.getUserPortraitMap(lineInfoDOS); List wantShopAreaIdList = lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getWantShopAreaId() != null).map(LineInfoDO::getWantShopAreaId).collect(Collectors.toList()); Map wantShopAreaMap = hyOpenAreaInfoDAO.selectNameMapByIds(wantShopAreaIdList); @@ -272,6 +282,7 @@ public class LineServiceImpl implements LineService { userIds.addAll(lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getDevelopmentManager() != null).map(LineInfoDO::getDevelopmentManager).collect(Collectors.toList())); userIds.addAll(lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getUpdateUserId() != null).map(LineInfoDO::getUpdateUserId).collect(Collectors.toList())); userIds.addAll(investmentManagerIds); + userIds.addAll(developmentManagerIds); Map userNameMap = enterpriseUserDAO.getUserNameMap(new ArrayList<>(userIds)); List signingBaseInfoDOS = intentAgreementMapper.selectByLineIds(lineIds); @@ -296,14 +307,20 @@ public class LineServiceImpl implements LineService { for (String s : userIdSet) { investmentManagerUserName.append(userNameMap.get(s)).append(","); } + StringBuilder developmentManagerUserName = new StringBuilder(); + Set developmentManagerIdsSet = developmentManagerMap.getOrDefault(x.getId(), new HashSet<>()); + developmentManagerIdsSet.add(x.getDevelopmentManager()); + for (String s : developmentManagerIdsSet) { + developmentManagerUserName.append(userNameMap.get(s)).append(","); + } partnerListVO.setUpdateTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, x.getUpdateTime())); partnerListVO.setLineSourceName(channelMapByIds.get(x.getLineSource())); partnerListVO.setJoinStatus(x.getJoinStatus()); partnerListVO.setJoinMode(x.getJoinMode()); partnerListVO.setPartnerNum(x.getPartnerNum()); - partnerListVO.setInvestmentManagerUserName(investmentManagerUserName.toString().substring(0, investmentManagerUserName.length() - 1)); + partnerListVO.setInvestmentManagerUserName(investmentManagerUserName.substring(0, investmentManagerUserName.length() - 1)); partnerListVO.setUpdateUserName(userNameMap.get(x.getUpdateUserId())); - partnerListVO.setDevelopmentManagerUserName(userNameMap.get(x.getDevelopmentManager())); + partnerListVO.setDevelopmentManagerUserName(developmentManagerUserName.substring(0, developmentManagerUserName.length() - 1)); partnerListVO.setWantShopNum(x.getWantShopNum()); result.add(partnerListVO); }); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java index 162838940..beb9ae127 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java @@ -273,6 +273,9 @@ public class PointServiceImpl implements PointService { throw new ServiceException(ErrorCodeEnum.POINT_AUDIT_NOT_SETTING); } List auditNode = dealAuditNode(auditSetting, pointInfo.getRegionId(), pointInfo.getDevelopmentManager()); + if(auditNode.size()==CommonConstants.ONE){ + updatePoint.setPointStatus(PointStatusEnum.POINT_STATUS_5.getCode()); + } //获取审批节点上的数据 List recordList = AuditNodeDTO.convertDO(pointId, submitAuditCount, auditNode); pointAuditRecordDAO.addPointAuditRecord(recordList); @@ -1108,6 +1111,7 @@ public class PointServiceImpl implements PointService { Map> userIdsMap = userAuthMappingService.getUserIdByRoleIdAndRegionId(roleIds, regionId); List firstApprovalUserIds = getUserIdsByPositionIds(firstApproval, userIdsMap); resultList.add(new AuditNodeDTO(NodeNoEnum.NODE_NO_0.getCode(), PointAuditRecordDO.SUBMIT_TASK, Boolean.FALSE, Arrays.asList(developmentManager))); + //todo 缺少兜底人 if(CollectionUtils.isNotEmpty(firstApprovalUserIds)){ resultList.add(new AuditNodeDTO(NodeNoEnum.NODE_NO_1.getCode(), PointAuditRecordDO.RECEIVE_TASK, Boolean.TRUE, firstApprovalUserIds)); }