From 555654e5c9b58088a9d252905faad7427a471726 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Mon, 24 Feb 2025 11:02:34 +0800 Subject: [PATCH 01/15] =?UTF-8?q?fix=20=E5=B0=8F=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=93=BA=E4=BD=8D=E5=8C=BA=E5=9F=9F=E5=92=8C?= =?UTF-8?q?=E9=80=89=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 02/15] =?UTF-8?q?fix=20=E9=80=89=E5=9D=80=E4=B8=93?= =?UTF-8?q?=E5=91=98=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)); } From 639a017534c82116c6913862c7df8720534e54b5 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Mon, 24 Feb 2025 14:05:58 +0800 Subject: [PATCH 03/15] =?UTF-8?q?fix=20=E6=B2=A1=E6=9C=89=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E4=BA=BA=E5=A2=9E=E5=8A=A0=E6=8A=A5=E9=94=99=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cool/store/enums/ErrorCodeEnum.java | 3 ++- .../java/com/cool/store/service/impl/PointServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java index 17656c38a..487c2624c 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java @@ -232,7 +232,8 @@ public enum ErrorCodeEnum { UPDATE_FAIL(131000,"修改失败，表单不存在！",null), LICENSE_LEGAL_STAGE_FAIL(131001,"营业执照阶段未上传！",null), GET_JURIDICAL_ID_CARD_NO_FAIL(131002,"获取法人身份证信息失败！",null), - UPDATE_INVESTMENT_MANAGER_FAIL(131005,"当前用户已经为该门店招商经理",null) + UPDATE_INVESTMENT_MANAGER_FAIL(131005,"当前用户已经为该门店招商经理",null), + CONFIRM_THE_APPROVER(131006,"您提交的铺位暂时找不到选址审批人，请联系系统管理员配置选址审批权限后再提交铺位审批",null) ; 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 beb9ae127..41b9ed0a9 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 @@ -274,7 +274,7 @@ public class PointServiceImpl implements PointService { } List auditNode = dealAuditNode(auditSetting, pointInfo.getRegionId(), pointInfo.getDevelopmentManager()); if(auditNode.size()==CommonConstants.ONE){ - updatePoint.setPointStatus(PointStatusEnum.POINT_STATUS_5.getCode()); + throw new ServiceException(ErrorCodeEnum.CONFIRM_THE_APPROVER); } //获取审批节点上的数据 List recordList = AuditNodeDTO.convertDO(pointId, submitAuditCount, auditNode); From 557617004f25115ed44d3a63624f805dcc55c879 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Mon, 24 Feb 2025 15:59:23 +0800 Subject: [PATCH 04/15] =?UTF-8?q?fix=20=E6=B2=A1=E6=9C=89=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E4=BA=BA=E5=A2=9E=E5=8A=A0=E6=8A=A5=E9=94=99=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/service/impl/PointServiceImpl.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 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 41b9ed0a9..2f9101b7a 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 @@ -246,6 +246,7 @@ public class PointServiceImpl implements PointService { @Override @Transactional(rollbackFor = Exception.class) public Integer submitAudit(SubmitPointAuditRequest request) { + Long pointId = request.getPointId(); PointInfoDO pointInfo = pointInfoDAO.getPointInfoById(pointId); if(Objects.isNull(pointInfo)){ @@ -257,6 +258,15 @@ public class PointServiceImpl implements PointService { log.error("铺位详细信息不存在"); throw new ServiceException(ErrorCodeEnum.POINT_NOT_EXIST); } + //处理子任务审核记录表 + AuditSettingVO auditSetting = getAuditSetting(); + if(Objects.isNull(auditSetting)){ + throw new ServiceException(ErrorCodeEnum.POINT_AUDIT_NOT_SETTING); + } + List auditNode = dealAuditNode(auditSetting, pointInfo.getRegionId(), pointInfo.getDevelopmentManager()); + if(auditNode.size()==CommonConstants.ONE){ + throw new ServiceException(ErrorCodeEnum.CONFIRM_THE_APPROVER); + } int submitAuditCount = pointInfo.getSubmitAuditCount() + 1; PointInfoDO updatePoint = new PointInfoDO(); updatePoint.setId(pointId); @@ -267,15 +277,6 @@ public class PointServiceImpl implements PointService { updatePointDetail.setDevelopmentManagerSign(request.getDevelopmentManagerSign()); updatePointDetail.setDevelopmentManagerSignTime(new Date()); pointDetailInfoDAO.updatePointDetailInfo(updatePointDetail); - //处理子任务审核记录表 - AuditSettingVO auditSetting = getAuditSetting(); - if(Objects.isNull(auditSetting)){ - throw new ServiceException(ErrorCodeEnum.POINT_AUDIT_NOT_SETTING); - } - List auditNode = dealAuditNode(auditSetting, pointInfo.getRegionId(), pointInfo.getDevelopmentManager()); - if(auditNode.size()==CommonConstants.ONE){ - throw new ServiceException(ErrorCodeEnum.CONFIRM_THE_APPROVER); - } //获取审批节点上的数据 List recordList = AuditNodeDTO.convertDO(pointId, submitAuditCount, auditNode); pointAuditRecordDAO.addPointAuditRecord(recordList); From 290ced1b8ac6eb2cda4265abf5c6a9242c527d1d Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Mon, 24 Feb 2025 17:47:28 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E7=A7=9F=E8=B5=81=E5=90=88=E5=90=8C?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=94=BE=E5=BC=80=E4=BA=BA=E5=91=98=E9=99=90?= =?UTF-8?q?=E5=88=B6?= 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 2f9101b7a..1195f448a 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 @@ -935,9 +935,10 @@ public class PointServiceImpl implements PointService { throw new ServiceException(ErrorCodeEnum.SHOP_STAGE_NOT_OPERATE); } LineInfoDO lineInfo = lineInfoDAO.getLineInfo(shopInfo.getLineId()); - if(!request.getOperateUserId().equals(lineInfo.getDevelopmentManager())){ - throw new ServiceException(ErrorCodeEnum.NO_PERMISSION); - } + //正新放开限制 +// if(!request.getOperateUserId().equals(lineInfo.getDevelopmentManager())){ +// throw new ServiceException(ErrorCodeEnum.NO_PERMISSION); +// } Long auditId = shopAuditInfoDAO.addAuditInfo(AuditRentContractRequest.convert(request, AuditTypeEnum.UPLOAD_RENT_CONTRACT)); ShopSubStageStatusEnum subStageStatus = AuditResultTypeEnum.PASS.getCode().equals(request.getResultType()) ? ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_23 : ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_22; From 7689e2c02b1993de3141f60c149f4535e256dc36 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Mon, 24 Feb 2025 17:51:43 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E5=8A=A0?= =?UTF-8?q?=E7=9B=9F=E8=B4=B9=E5=A4=84=E7=90=86=E4=BA=BA=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/enums/UserRoleEnum.java | 8 ++- .../store/service/impl/DeskServiceImpl.java | 62 ++++++++++--------- 2 files changed, 39 insertions(+), 31 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java index dfb5c5a0b..cd5dfdca9 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java @@ -43,7 +43,13 @@ public enum UserRoleEnum { TENT_PASS_CUSTOMER(380000000L,"营帐通客服"), DESIGN_CUSTOMER(390000000L,"设计客服"), CONSTRUCTION_CUSTOMER(400000000L,"施工客服"), - BRANCH_OFFICE(1724233283449L,"分布内勤"), + BRANCH_OFFICE(1724233283449L,"分部内勤"), + JOIN_OFFICE(1719278230274L,"加盟内勤"), + REGION_OFFICE(410000000L,"大区内勤"), + FINANCE(1735895867344L,"财务"), + CHUAN_XIAO_MEI_MANAGER(1731635078802L,"串小妹大区执行总经理"), + REGIONAL_MANAGER(420000000L,"大区经理"), + ; private Long code; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java index db7e5735a..d7b9152e6 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java @@ -224,33 +224,35 @@ public class DeskServiceImpl implements DeskService { } - @Override public PageInfo payFranchiseFeesPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) { List userRoleIds = enterpriseUserRoleMapper.getUserRoleIds(user.getUserId()); PageInfo pageInfo = new PageInfo<>(); if (CollectionUtils.isNotEmpty(userRoleIds) - && (userRoleIds.contains(UserRoleEnum.SUPERVISION.getCode()) - ||userRoleIds.contains(UserRoleEnum.INVESTMENT_COMMISSIONER.getCode()) - ||userRoleIds.contains(UserRoleEnum.STRONG_INVESTMENT_COMMISSIONER.getCode()))){ - pageInfo = commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_7, - Collections.singletonList(SHOP_SUB_STAGE_STATUS_70.getShopSubStageStatus()), Boolean.FALSE); + && (userRoleIds.contains(UserRoleEnum.JOIN_OFFICE.getCode()) + || userRoleIds.contains(UserRoleEnum.REGION_OFFICE.getCode()) + )) { + pageInfo = commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_7, + Collections.singletonList(SHOP_SUB_STAGE_STATUS_70.getShopSubStageStatus()), Boolean.FALSE); } - if (CollectionUtils.isNotEmpty(userRoleIds)&& userRoleIds.contains(UserRoleEnum.BRANCH_OFFICE.getCode())){ + if (CollectionUtils.isNotEmpty(userRoleIds) + && (userRoleIds.contains(UserRoleEnum.BRANCH_OFFICE.getCode()) + || userRoleIds.contains(UserRoleEnum.REGION_OFFICE.getCode()) + )) { pageInfo = commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_7, Collections.singletonList(SHOP_SUB_STAGE_STATUS_72.getShopSubStageStatus()), Boolean.TRUE); } List list = pageInfo.getList(); - if (CollectionUtils.isEmpty(list)){ + if (CollectionUtils.isEmpty(list)) { return pageInfo; } List shopIds = list.stream().map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList()); - Map shopPayDoMap = linePayDAO.getLinePayByShopIds(shopIds, PayBusinessTypeEnum.FRANCHISE_FEE.getCode()); - for (PreparationCommonPendingVO vo:list){ - vo.setSubmitTime(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START, shopPayDoMap.getOrDefault(vo.getShopId(), new LinePayDO()).getCreateTime())); - } + Map shopPayDoMap = linePayDAO.getLinePayByShopIds(shopIds, PayBusinessTypeEnum.FRANCHISE_FEE.getCode()); + for (PreparationCommonPendingVO vo : list) { + vo.setSubmitTime(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START, shopPayDoMap.getOrDefault(vo.getShopId(), new LinePayDO()).getCreateTime())); + } pageInfo.setList(list); return pageInfo; } @@ -261,14 +263,14 @@ public class DeskServiceImpl implements DeskService { Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_80.getShopSubStageStatus(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_85.getShopSubStageStatus()), Boolean.TRUE); List list = pageInfo.getList(); - if (CollectionUtils.isEmpty(list)){ + if (CollectionUtils.isEmpty(list)) { return pageInfo; } List shopIds = list.stream().map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList()); Map> deskStageMap = new HashMap<>(); List subStageList = shopStageInfoDAO.getSubStages(shopIds, ShopSubStageEnum.SHOP_STAGE_7.getShopSubStage()); doThing(deskStageMap, subStageList); - for (PreparationCommonPendingVO vo :list){ + for (PreparationCommonPendingVO vo : list) { vo.setSubmitTime(deskStageMap.get(vo.getShopId()).get(0).getActualCompleteTime()); } pageInfo.setList(list); @@ -299,14 +301,14 @@ public class DeskServiceImpl implements DeskService { PageInfo pageInfo = commonPendingVOPageInfo(pageNum, pageSize, null, ShopSubStageEnum.SHOP_STAGE_23, Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_230.getShopSubStageStatus()), Boolean.FALSE); List list = pageInfo.getList(); - if (CollectionUtils.isEmpty(list)){ + if (CollectionUtils.isEmpty(list)) { return pageInfo; } List shopIds = list.stream().map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList()); Map> deskStageMap = new HashMap<>(); List subStageList = shopStageInfoDAO.getSubStages(shopIds, ShopSubStageEnum.SHOP_STAGE_8.getShopSubStage()); doThing(deskStageMap, subStageList); - for (PreparationCommonPendingVO vo :list){ + for (PreparationCommonPendingVO vo : list) { vo.setSubmitTime(deskStageMap.get(vo.getShopId()).get(0).getActualCompleteTime()); } pageInfo.setList(list); @@ -320,14 +322,14 @@ public class DeskServiceImpl implements DeskService { PageInfo pageInfo = commonPendingVOPageInfo(pageNum, pageSize, null, ShopSubStageEnum.SHOP_STAGE_16, Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_160.getShopSubStageStatus()), Boolean.FALSE); List list = pageInfo.getList(); - if (CollectionUtils.isEmpty(list)){ + if (CollectionUtils.isEmpty(list)) { return pageInfo; } List shopIds = list.stream().map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList()); Map> deskStageMap = new HashMap<>(); List subStageList = shopStageInfoDAO.getSubStages(shopIds, ShopSubStageEnum.SHOP_STAGE_8.getShopSubStage()); doThing(deskStageMap, subStageList); - for (PreparationCommonPendingVO vo :list){ + for (PreparationCommonPendingVO vo : list) { vo.setSubmitTime(deskStageMap.get(vo.getShopId()).get(0).getActualCompleteTime()); } pageInfo.setList(list); @@ -341,14 +343,14 @@ public class DeskServiceImpl implements DeskService { PageInfo pageInfo = commonPendingVOPageInfo(pageNum, pageSize, null, ShopSubStageEnum.SHOP_STAGE_24, Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_240.getShopSubStageStatus()), Boolean.FALSE); List list = pageInfo.getList(); - if (CollectionUtils.isEmpty(list)){ + if (CollectionUtils.isEmpty(list)) { return pageInfo; } List shopIds = list.stream().map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList()); Map> deskStageMap = new HashMap<>(); List subStageList = shopStageInfoDAO.getSubStages(shopIds, ShopSubStageEnum.SHOP_STAGE_8.getShopSubStage()); doThing(deskStageMap, subStageList); - for (PreparationCommonPendingVO vo :list){ + for (PreparationCommonPendingVO vo : list) { vo.setSubmitTime(deskStageMap.get(vo.getShopId()).get(0).getActualCompleteTime()); } pageInfo.setList(list); @@ -361,14 +363,14 @@ public class DeskServiceImpl implements DeskService { PageInfo pageInfo = commonPendingVOPageInfo(pageNum, pageSize, null, ShopSubStageEnum.SHOP_STAGE_17, Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_170.getShopSubStageStatus()), Boolean.FALSE); List list = pageInfo.getList(); - if (CollectionUtils.isEmpty(list)){ + if (CollectionUtils.isEmpty(list)) { return pageInfo; } List shopIds = list.stream().map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList()); Map> deskStageMap = new HashMap<>(); List subStageList = shopStageInfoDAO.getSubStages(shopIds, ShopSubStageEnum.SHOP_STAGE_8.getShopSubStage()); doThing(deskStageMap, subStageList); - for (PreparationCommonPendingVO vo :list){ + for (PreparationCommonPendingVO vo : list) { vo.setSubmitTime(deskStageMap.get(vo.getShopId()).get(0).getActualCompleteTime()); } pageInfo.setList(list); @@ -380,14 +382,14 @@ public class DeskServiceImpl implements DeskService { PageInfo pageInfo = commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_9, Arrays.asList(SHOP_SUB_STAGE_STATUS_90.getShopSubStageStatus()), Boolean.TRUE); List list = pageInfo.getList(); - if (CollectionUtils.isEmpty(list)){ + if (CollectionUtils.isEmpty(list)) { return pageInfo; } List shopIds = list.stream().map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList()); Map> deskStageMap = new HashMap<>(); List subStageList = shopStageInfoDAO.getSubStages(shopIds, ShopSubStageEnum.SHOP_STAGE_8.getShopSubStage()); doThing(deskStageMap, subStageList); - for (PreparationCommonPendingVO vo :list){ + for (PreparationCommonPendingVO vo : list) { vo.setSubmitTime(deskStageMap.get(vo.getShopId()).get(0).getActualCompleteTime()); } pageInfo.setList(list); @@ -396,11 +398,11 @@ public class DeskServiceImpl implements DeskService { @Override public PageInfo constructionPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) { - PageInfo pageInfo =commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_11, + PageInfo pageInfo = commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_11, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_110.getShopSubStageStatus(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_111.getShopSubStageStatus()), Boolean.TRUE); List list = pageInfo.getList(); - if (CollectionUtils.isEmpty(list)){ + if (CollectionUtils.isEmpty(list)) { return pageInfo; } List shopIds = list.stream().map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList()); @@ -424,7 +426,7 @@ public class DeskServiceImpl implements DeskService { deskStageMap.put(decorationDesignInfoDO.getShopId(), deskStages); } } - for (PreparationCommonPendingVO vo :list){ + for (PreparationCommonPendingVO vo : list) { for (DeskStageDTO deskStageDTO : deskStageMap.get(vo.getShopId())) { if (vo.getSubStageStatus().equals(deskStageDTO.getShopSubStageStatus())) { vo.setSubmitTime(deskStageDTO.getActualCompleteTime()); @@ -439,10 +441,10 @@ public class DeskServiceImpl implements DeskService { @Override public PageInfo fitmentPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) { - PageInfo pageInfo = commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_12, + PageInfo pageInfo = commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_12, Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_122.getShopSubStageStatus()), Boolean.FALSE); List list = pageInfo.getList(); - if (CollectionUtils.isEmpty(list)){ + if (CollectionUtils.isEmpty(list)) { return pageInfo; } List shopIds = list.stream().map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList()); @@ -454,7 +456,7 @@ public class DeskServiceImpl implements DeskService { dto.setShopSubStageStatus(SHOP_SUB_STAGE_STATUS_122.getShopSubStageStatus()); deskStageMap.put(acceptanceInfoDO.getShopId(), Collections.singletonList(dto)); } - for (PreparationCommonPendingVO vo :list){ + for (PreparationCommonPendingVO vo : list) { for (DeskStageDTO deskStageDTO : deskStageMap.get(vo.getShopId())) { if (vo.getSubStageStatus().equals(deskStageDTO.getShopSubStageStatus())) { vo.setSubmitTime(deskStageDTO.getActualCompleteTime()); From 766bb5cccedb8d32d816dc50e4625d1f95d36d2c Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Mon, 24 Feb 2025 17:53:23 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=96=87=E6=A1=88=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cool/store/dto/ExportBranchShopDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/ExportBranchShopDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/ExportBranchShopDTO.java index 6bd34d18a..fbdfb98fa 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/ExportBranchShopDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/ExportBranchShopDTO.java @@ -54,7 +54,7 @@ public class ExportBranchShopDTO { @ColumnWidth(30) private String firstYearStartTime; - @ExcelProperty(value = "第一年加盟结束时间",order = 10) + @ExcelProperty(value = "第一年管理费到期时间",order = 10) @ColumnWidth(30) private String firstYearEndTime; From a064b1b08e7d55f8a510c1c97f5229d06299f407 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Mon, 24 Feb 2025 18:36:09 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/FranchiseFeeMapper.xml | 2 + .../com/cool/store/dto/FranchiseFeeDTO.java | 17 ++++-- .../impl/ExportRealizeServiceImpl.java | 57 +++++++++++++++++-- 3 files changed, 65 insertions(+), 11 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml index e7f4d8cef..81e26ec33 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml @@ -17,7 +17,9 @@ select a.shop_id AS shopId , b.pay_time as payTime, - b.combined_field as combinedField, a.year_franchise_fee as yearFranchiseFee, a.first_year_manage_fee as firstYearManagementFee, a.loan_margin as loanMargin, diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/FranchiseFeeDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/FranchiseFeeDTO.java index 59f658af8..e0539eac8 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/FranchiseFeeDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/FranchiseFeeDTO.java @@ -32,8 +32,6 @@ public class FranchiseFeeDTO { private String firstYearFee; //履约保证金 private String performanceBond; - //组合字段 - private String combinedField; private List payTimeList; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java index c3d3f7549..de06f6844 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java @@ -107,16 +107,9 @@ public class ExportRealizeServiceImpl implements ExportRealizeService { List shopIds = list.stream().map(BranchShopResponse::getShopId).collect(Collectors.toList()); List signFranchises = signFranchiseMapper.selectByShopIds(shopIds); List franchiseFees = franchiseFeeMapper.getPayTimeByShopIds(shopIds); - Map> payTimeMap = new HashMap<>(); - for (FranchiseFeeDTO dto : franchiseFees) { - List payTimeList = JsonToDate(dto.getCombinedField()); - if (dto.getPayTime() != null) { - payTimeList.add(dto.getPayTime()); - } - Collections.sort(payTimeList); - payTimeMap.put(dto.getShopId(), payTimeList); - } - + Map payTimeMap = franchiseFees.stream().filter(o -> o.getPayTime() != null) + .filter(o -> o.getShopId() != null) + .collect(Collectors.toMap(FranchiseFeeDTO::getShopId, FranchiseFeeDTO::getPayTime)); Map franchiseFeeDTOMap = franchiseFees.stream().filter(o -> o.getShopId() != null) .collect(Collectors.toMap(FranchiseFeeDTO::getShopId, Function.identity())); Map signFranchiseMap = new HashMap<>(); @@ -157,22 +150,9 @@ public class ExportRealizeServiceImpl implements ExportRealizeService { dto.setContractStartTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, signFranchiseDO.getContractStartTime())); dto.setContractEndTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, signFranchiseDO.getContractEndTime())); } - List payTime = payTimeMap.getOrDefault(response.getShopId(), new ArrayList<>()); - for (int i = 0; i < payTime.size() && i <= 3; i++) { - switch (i) { - case 0: - dto.setFirstPayTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, payTime.get(i))); - break; - case 1: - dto.setSecondPayTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, payTime.get(i))); - break; - case 2: - dto.setThirdPayTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, payTime.get(i))); - break; - case 3: - dto.setFourthPayTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, payTime.get(i))); - break; - } + Date payTime = payTimeMap.get(response.getShopId()); + if (Objects.nonNull(payTime)) { + dto.setFirstPayTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, payTime)); } InvoicingDO invoicingDO = InvoicingMap.get(response.getShopId()); if (invoicingDO != null) { @@ -216,26 +196,5 @@ public class ExportRealizeServiceImpl implements ExportRealizeService { } return o.toString(); } - - private List JsonToDate(String json) { - ObjectMapper mapper = new ObjectMapper(); - // 解析JSON字符串为JsonNode对象 - JsonNode jsonNode = null; - try { - jsonNode = mapper.readTree(json); - List payTimeList = new ArrayList<>(); - // 遍历数组节点 - for (JsonNode node : jsonNode) { - long payTime = node.get("payTime").asLong(); - // 将时间戳转换为Date对象 - Date date = new Date(payTime); - payTimeList.add(date); - } - return payTimeList; - } catch (Exception e) { - log.info("解析加盟费缴纳时间json失败"); - throw new RuntimeException(e); - } - } } From 99536ae6021afaeaa45fa362ea4124e312078d51 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Tue, 25 Feb 2025 15:07:34 +0800 Subject: [PATCH 10/15] =?UTF-8?q?fix=20=E9=80=89=E5=9D=80=E4=B8=93?= =?UTF-8?q?=E5=91=98null=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/service/impl/LineServiceImpl.java | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 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 43a2d1ca4..5d93e8e3b 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 @@ -270,8 +270,8 @@ public class LineServiceImpl implements LineService { 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()); + Set investmentManagerIds = shopInfoDOS.stream().filter(x -> StringUtils.isNotBlank(x.getInvestmentManager())).map(ShopInfoDO::getInvestmentManager).collect(Collectors.toSet()); + Set developmentManagerIds = shopInfoDOS.stream().filter(x -> StringUtils.isNotBlank(x.getDevelopmentManager())).map(ShopInfoDO::getDevelopmentManager).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); @@ -305,22 +305,32 @@ public class LineServiceImpl implements LineService { Set userIdSet = investmentManagerIdMapByLineId.getOrDefault(x.getId(), new HashSet<>()); userIdSet.add(x.getInvestmentManager()); for (String s : userIdSet) { - investmentManagerUserName.append(userNameMap.get(s)).append(","); + if (investmentManagerUserName.length() ==0) { + investmentManagerUserName.append(userNameMap.get(s)); + }else{ + investmentManagerUserName.append(",").append(userNameMap.get(s)); + } } StringBuilder developmentManagerUserName = new StringBuilder(); Set developmentManagerIdsSet = developmentManagerMap.getOrDefault(x.getId(), new HashSet<>()); - developmentManagerIdsSet.add(x.getDevelopmentManager()); + if (StringUtils.isNotBlank(x.getDevelopmentManager())) { + developmentManagerIdsSet.add(x.getDevelopmentManager()); + } for (String s : developmentManagerIdsSet) { - developmentManagerUserName.append(userNameMap.get(s)).append(","); + if (investmentManagerUserName.length() ==0) { + developmentManagerUserName.append(userNameMap.get(s)); + }else{ + developmentManagerUserName.append(",").append(userNameMap.get(s)); + } } 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.substring(0, investmentManagerUserName.length() - 1)); + partnerListVO.setInvestmentManagerUserName(investmentManagerUserName.toString()); partnerListVO.setUpdateUserName(userNameMap.get(x.getUpdateUserId())); - partnerListVO.setDevelopmentManagerUserName(developmentManagerUserName.substring(0, developmentManagerUserName.length() - 1)); + partnerListVO.setDevelopmentManagerUserName(developmentManagerUserName.toString()); partnerListVO.setWantShopNum(x.getWantShopNum()); result.add(partnerListVO); }); From d76fa0092364b1a509d095e9b29a4bd656e137f2 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Tue, 25 Feb 2025 15:17:45 +0800 Subject: [PATCH 11/15] =?UTF-8?q?fix=20=E9=80=89=E5=9D=80=E4=B8=93?= =?UTF-8?q?=E5=91=98null=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/service/impl/LineServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 5d93e8e3b..b7bf2dbba 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 @@ -317,7 +317,10 @@ public class LineServiceImpl implements LineService { developmentManagerIdsSet.add(x.getDevelopmentManager()); } for (String s : developmentManagerIdsSet) { - if (investmentManagerUserName.length() ==0) { + if(StringUtils.isBlank(s)){ + continue; + } + if (developmentManagerUserName.length() ==0) { developmentManagerUserName.append(userNameMap.get(s)); }else{ developmentManagerUserName.append(",").append(userNameMap.get(s)); From 74fa4a0fd1e30154b7b2fbb9d19f2237aeefa15c Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Tue, 25 Feb 2025 15:31:42 +0800 Subject: [PATCH 12/15] fix --- .../main/resources/mapper/ShopInfoMapper.xml | 3 +- .../store/service/impl/LineServiceImpl.java | 47 ++++++++++++++----- 2 files changed, 36 insertions(+), 14 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml index ff016ca2a..8289cccc7 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml @@ -391,7 +391,8 @@