From 88767d05a8fbfa887723cbace3e638bb115e168a Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 19 Feb 2025 16:12:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=20=E7=9F=AD=E4=BF=A1=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E6=89=BE=E4=BA=BA=E5=87=BA=E7=8E=B0null=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BuildInformationServiceImpl.java | 20 ++++- .../store/service/impl/CommonService.java | 2 + .../service/impl/DecorationServiceImpl.java | 73 ++++++++++--------- .../service/impl/FranchiseFeeServiceImpl.java | 8 +- .../impl/IntentAgreementServiceImpl.java | 13 ++-- .../service/impl/LinePayServiceImpl.java | 8 +- .../impl/OpeningOperationPlanImpl.java | 9 ++- .../impl/PlatformBuildServiceImpl.java | 35 +++++++-- .../store/service/impl/ShopServiceImpl.java | 16 ++-- .../impl/SignFranchiseServiceImpl.java | 5 +- 10 files changed, 116 insertions(+), 73 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java index 9f19a387a..f13a950dc 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java @@ -113,22 +113,34 @@ public class BuildInformationServiceImpl implements BuildInformationService{ map.put("partnerMobile",lineInfoDO.getMobile()); map.put("storeName",shopInfoDO.getShopName()); List itList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.IT_EMPLOYEE, shopInfoDO.getRegionId()); - List itUsers = itList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()); + List itUsers = new ArrayList<>(); + if (!itList.isEmpty()){ + itUsers.addAll(itList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); + } commonService.sendQWMessage(itUsers, MessageEnum.MESSAGE_39, map); List posList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.HUO_MA_EMPLOYEE, shopInfoDO.getRegionId()); - List posUsers = posList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()); + List posUsers = new ArrayList<>(); + if (!posList.isEmpty()){ + posUsers.addAll( posList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); + } commonService.sendQWMessage(posUsers, MessageEnum.MESSAGE_38, map); List xfList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.XIN_FA_SYS_CUSTOMER, shopInfoDO.getRegionId()); - List xfUsers = xfList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()); + List xfUsers = new ArrayList<>(); + if(!xfList.isEmpty()){ + xfUsers.addAll(xfList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); + } commonService.sendQWMessage(xfUsers, MessageEnum.MESSAGE_40, map); List zxtList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.TENT_PASS_CUSTOMER, shopInfoDO.getRegionId()); - List zxtUsers = xfList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()); + List zxtUsers = new ArrayList<>(); + if(!zxtList.isEmpty()){ + zxtUsers.addAll(zxtList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); + } commonService.sendQWMessage(zxtUsers, MessageEnum.MESSAGE_41, map); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonService.java index 3968708d3..ae440df5e 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonService.java @@ -188,10 +188,12 @@ public class CommonService { public void sendQWMessage(List userIds, MessageEnum message, Map requestMap){ log.info("message:{}, request:{}, userIds:{}", message.getTitle(), JSONObject.toJSONString(requestMap), JSONObject.toJSONString(userIds)); if(CollectionUtils.isEmpty(userIds)){ + log.info("消息接收人列表为空"); return; } userIds = userIds.stream().filter(StringUtils::isNotBlank).collect(Collectors.toList()); if(CollectionUtils.isEmpty(userIds)){ + log.info("消息接收人列表为空"); return; } try { diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java index ea0f2098d..1f7e29f30 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java @@ -134,7 +134,9 @@ public class DecorationServiceImpl implements DecorationService { } //预算 BudgetDTO proposedBookBudget = getBudgetDTOS(decoration); - if (proposedBookBudget == null) {return null;} + if (proposedBookBudget == null) { + return null; + } BigDecimal vzHj = proposedBookBudget.getVzHj(); //支付二维码url DecorationModelDTO decorationModelDTO = new DecorationModelDTO(); @@ -364,11 +366,14 @@ public class DecorationServiceImpl implements DecorationService { ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(request.getShopId()); LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(shopInfoDO.getLineId()); HashMap map = new HashMap<>(); - map.put("partnerUsername",lineInfoDO.getUsername()); - map.put("partnerMobile",lineInfoDO.getMobile()); - map.put("storeName",shopInfoDO.getShopName()); + map.put("partnerUsername", lineInfoDO.getUsername()); + map.put("partnerMobile", lineInfoDO.getMobile()); + map.put("storeName", shopInfoDO.getShopName()); List userDOList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.ENGINEER_DEP_SUPERVISOR, shopInfoDO.getRegionId()); - List userIds = userDOList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()); + List userIds = new ArrayList<>(); + if (!userDOList.isEmpty()) { + userIds.addAll(userDOList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); + } commonService.sendQWMessage(userIds, MessageEnum.MESSAGE_37, map); @@ -390,7 +395,7 @@ public class DecorationServiceImpl implements DecorationService { List fitmentCheckVOList = new ArrayList<>(); //shopId,lineid,regionid,shopname,storenum, - List shopInfoDOS = shopInfoMapper.selectShopListByRegionId(regions, ShopSubStageEnum.SHOP_STAGE_12.getShopSubStage(),request.getSubStageStatus(),null); + List shopInfoDOS = shopInfoMapper.selectShopListByRegionId(regions, ShopSubStageEnum.SHOP_STAGE_12.getShopSubStage(), request.getSubStageStatus(), null); PageInfo pageInfo = new PageInfo<>(shopInfoDOS); if (shopInfoDOS.isEmpty()) { log.info("该工程部监理下门店为空"); @@ -461,7 +466,7 @@ public class DecorationServiceImpl implements DecorationService { } } if (Objects.nonNull(ShopStageInfoDOMap.get(shopId))) { - fitmentCheckVO.setShopSubStageStatus(ShopStageInfoDOMap.getOrDefault(shopId,new ShopStageInfoDO()).getShopSubStageStatus()); + fitmentCheckVO.setShopSubStageStatus(ShopStageInfoDOMap.getOrDefault(shopId, new ShopStageInfoDO()).getShopSubStageStatus()); } fitmentCheckVOList.add(fitmentCheckVO); } @@ -528,25 +533,25 @@ public class DecorationServiceImpl implements DecorationService { //重复提交校验 3秒内不能重复提交 String lockKey = "submitDecorationDesign:" + request.getShopId(); String lockValue = UUID.randomUUID().toString(); - boolean acquired = redisUtilPool.setNxExpire(lockKey, lockValue, CommonConstants.THREE*CommonConstants.ONE_SECONDS); - if (!acquired){ + boolean acquired = redisUtilPool.setNxExpire(lockKey, lockValue, CommonConstants.THREE * CommonConstants.ONE_SECONDS); + if (!acquired) { throw new ServiceException(ErrorCodeEnum.DUPLICATE_SUBMISSION); } //校验参数 - if (Objects.isNull(request)||request.getShopId()==null){ + if (Objects.isNull(request) || request.getShopId() == null) { throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); } //必须是待提交状态才能提交 ShopStageInfoDO shopStageInfo = shopStageInfoDAO.getByShopIdAndSubStage(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_9.getShopSubStage()); - if (shopStageInfo!=null&&!ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_90.getShopSubStageStatus().equals(shopStageInfo.getShopSubStageStatus())) { + if (shopStageInfo != null && !ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_90.getShopSubStageStatus().equals(shopStageInfo.getShopSubStageStatus())) { throw new ServiceException(ErrorCodeEnum.STATUS_NOT_SUPPORT_SUMMIT); } DecorationDesignInfoDO decorationDesignInfoDO = request.toDecorationDesignInfoDO(); DecorationDesignInfoDO decoration = decorationDesignInfoDAO.getByShopId(request.getShopId()); - if (Objects.nonNull(decoration)){ + if (Objects.nonNull(decoration)) { decorationDesignInfoDO.setId(decoration.getId()); decorationDesignInfoDAO.updateByPrimaryKeySelective(decorationDesignInfoDO); - }else { + } else { decorationDesignInfoDAO.insertSelective(decorationDesignInfoDO); } //更新装修设计状态 @@ -555,17 +560,17 @@ public class DecorationServiceImpl implements DecorationService { LineInfoDO lineInfo = lineInfoMapper.getByLineId(shopInfo.getLineId()); Map templateParam = new HashMap<>(); templateParam.put("shopName", shopInfo.getShopName()); - commonService.sendSms(lineInfo.getMobile(),SMSMsgEnum.DESIGN_STAGE,templateParam); + commonService.sendSms(lineInfo.getMobile(), SMSMsgEnum.DESIGN_STAGE, templateParam); return Boolean.TRUE; } @Override public DecorationDesignVO getDecorationDesign(Long shopId) { - if (shopId==null){ + if (shopId == null) { throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); } DecorationDesignInfoDO decoration = decorationDesignInfoDAO.getByShopId(shopId); - if (!Objects.isNull(decoration)){ + if (!Objects.isNull(decoration)) { DecorationDesignVO decorationDesignVO = new DecorationDesignVO(); decorationDesignVO.setDesignUrl(decoration.getDesignUrl()); decorationDesignVO.setRemark(decoration.getRemark()); @@ -581,17 +586,17 @@ public class DecorationServiceImpl implements DecorationService { public Boolean submitConstructionData(ConstructionRequest request, LoginUserInfo user) { String lockKey = "submitConstructionData:" + request.getShopId(); String lockValue = UUID.randomUUID().toString(); - boolean acquired = redisUtilPool.setNxExpire(lockKey, lockValue, CommonConstants.THREE*CommonConstants.ONE_SECONDS); - if (!acquired){ + boolean acquired = redisUtilPool.setNxExpire(lockKey, lockValue, CommonConstants.THREE * CommonConstants.ONE_SECONDS); + if (!acquired) { throw new ServiceException(ErrorCodeEnum.DUPLICATE_SUBMISSION); } //校验参数 - if (Objects.isNull(request)||request.getShopId()==null){ + if (Objects.isNull(request) || request.getShopId() == null) { throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); } //必须是待提交状态才能提交 ShopStageInfoDO shopStageInfo = shopStageInfoDAO.getByShopIdAndSubStage(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_11.getShopSubStage()); - if (shopStageInfo!=null&&!ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_110.getShopSubStageStatus().equals(shopStageInfo.getShopSubStageStatus())) { + if (shopStageInfo != null && !ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_110.getShopSubStageStatus().equals(shopStageInfo.getShopSubStageStatus())) { throw new ServiceException(ErrorCodeEnum.STATUS_NOT_SUPPORT_SUMMIT); } DecorationDesignInfoDO decoration = decorationDesignInfoDAO.getByShopId(request.getShopId()); @@ -611,16 +616,16 @@ public class DecorationServiceImpl implements DecorationService { public ConstructionDataVO getConstructionData(Long shopId) { ConstructionDataVO constructionDataVO = new ConstructionDataVO(); DecorationDesignInfoDO decoration = decorationDesignInfoDAO.getByShopId(shopId); - if (Objects.isNull(decoration)){ + if (Objects.isNull(decoration)) { return constructionDataVO; } constructionDataVO.setConstructionAnnex(decoration.getConstructionAnnex()); constructionDataVO.setConstructionRemark(decoration.getConstructionRemark()); - constructionDataVO.setConstructionPlanStartTime(decoration.getConstructionPlanStartTime()!=null?decoration.getConstructionPlanStartTime().getTime():null); - constructionDataVO.setConstructionPlanEndTime(decoration.getConstructionPlanEndTime()!=null?decoration.getConstructionPlanEndTime().getTime():null); - constructionDataVO.setConstructionCreateTime(decoration.getConstructionCreateTime()!=null?decoration.getConstructionCreateTime().getTime():null); + constructionDataVO.setConstructionPlanStartTime(decoration.getConstructionPlanStartTime() != null ? decoration.getConstructionPlanStartTime().getTime() : null); + constructionDataVO.setConstructionPlanEndTime(decoration.getConstructionPlanEndTime() != null ? decoration.getConstructionPlanEndTime().getTime() : null); + constructionDataVO.setConstructionCreateTime(decoration.getConstructionCreateTime() != null ? decoration.getConstructionCreateTime().getTime() : null); constructionDataVO.setConstructionCreateUser(decoration.getConstructionCreateUser()); - if (StringUtils.isNotEmpty(decoration.getConstructionCreateUser())){ + if (StringUtils.isNotEmpty(decoration.getConstructionCreateUser())) { EnterpriseUserDO user = enterpriseUserDAO.getUserInfoById(decoration.getConstructionCreateUser()); constructionDataVO.setConstructionCreateUserName(user.getName()); } @@ -633,13 +638,13 @@ public class DecorationServiceImpl implements DecorationService { //重复提交校验 3秒内不能重复提交 String lockKey = "confirmDesign:" + request.getShopId(); String lockValue = UUID.randomUUID().toString(); - boolean acquired = redisUtilPool.setNxExpire(lockKey, lockValue, CommonConstants.THREE*CommonConstants.ONE_SECONDS); - if (!acquired){ + boolean acquired = redisUtilPool.setNxExpire(lockKey, lockValue, CommonConstants.THREE * CommonConstants.ONE_SECONDS); + if (!acquired) { throw new ServiceException(ErrorCodeEnum.DUPLICATE_SUBMISSION); } DecorationDesignInfoDO decorationDesignInfoDO = request.toDecorationDesignInfoDO(); DecorationDesignInfoDO decoration = decorationDesignInfoDAO.getByShopId(request.getShopId()); - if (Objects.nonNull(decoration)){ + if (Objects.nonNull(decoration)) { decorationDesignInfoDO.setId(decoration.getId()); decorationDesignInfoDAO.updateByPrimaryKeySelective(decorationDesignInfoDO); } @@ -648,9 +653,9 @@ public class DecorationServiceImpl implements DecorationService { ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId()); LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(shopInfo.getLineId()); HashMap map = new HashMap<>(); - map.put("partnerUsername",lineInfoDO.getUsername()); - map.put("partnerMobile",lineInfoDO.getMobile()); - map.put("storeName",shopInfo.getShopName()); + map.put("partnerUsername", lineInfoDO.getUsername()); + map.put("partnerMobile", lineInfoDO.getMobile()); + map.put("storeName", shopInfo.getShopName()); commonService.sendQWMessage(Collections.singletonList(shopInfo.getInvestmentManager()), MessageEnum.MESSAGE_36, map); @@ -662,11 +667,11 @@ public class DecorationServiceImpl implements DecorationService { public Boolean confirmComplete(Long shopId, LoginUserInfo user) { //判断施工阶段是否时施工中 施工中才能施工完成 ShopStageInfoDO shopStageInfoDO = shopStageInfoDAO.getByShopIdAndSubStage(shopId, ShopSubStageEnum.SHOP_STAGE_11.getShopSubStage()); - if (shopStageInfoDO!=null && !ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_111.getShopSubStageStatus().equals(shopStageInfoDO.getShopSubStageStatus())){ + if (shopStageInfoDO != null && !ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_111.getShopSubStageStatus().equals(shopStageInfoDO.getShopSubStageStatus())) { throw new ServiceException(ErrorCodeEnum.DESIGN_NO_COMPLETE); } AcceptanceInfoDO acceptance = acceptanceInfoDAO.selectByShopId(shopId); - if(Objects.isNull(acceptance)) { + if (Objects.isNull(acceptance)) { AcceptanceInfoDO acceptanceInfoDO = new AcceptanceInfoDO(); acceptanceInfoDO.setShopId(shopId); acceptanceInfoDO.setCreateTime(new Date()); @@ -677,7 +682,7 @@ public class DecorationServiceImpl implements DecorationService { LineInfoDO lineInfo = lineInfoMapper.getByLineId(shopInfo.getLineId()); Map templateParam = new HashMap<>(); templateParam.put("shopName", shopInfo.getShopName()); - commonService.sendSms(lineInfo.getMobile(),SMSMsgEnum.CONSTRUCTION_STAGE,templateParam); + commonService.sendSms(lineInfo.getMobile(), SMSMsgEnum.CONSTRUCTION_STAGE, templateParam); return Boolean.TRUE; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java index ea7628441..c574bcbc3 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java @@ -129,13 +129,13 @@ public class FranchiseFeeServiceImpl implements FranchiseFeeService { LineInfoDO lineInfo = lineInfoMapper.getByLineId(shopInfoDO.getLineId()); Set franchiseContractUser = new HashSet<>(); List joinUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.JOIN_OFFICE, shopInfoDO.getRegionId()); - Set joinUserIds = joinUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); - if (!joinUserIds.isEmpty()) { + if (!joinUser.isEmpty()) { + Set joinUserIds = joinUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); franchiseContractUser.addAll(joinUserIds); } List regionUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.REGION_OFFICE, shopInfoDO.getRegionId()); - Set regionUserIds = regionUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); - if (!regionUserIds.isEmpty()) { + if (!regionUser.isEmpty()) { + Set regionUserIds = regionUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); franchiseContractUser.addAll(regionUserIds); } HashMap map = new HashMap<>(); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java index d50666081..4514b1d9d 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java @@ -163,17 +163,16 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten SetpublishFranchiseFeeUsers = new HashSet<>(); for (Long regionId : regionIds){ List joinUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.JOIN_OFFICE, regionId); - Set joinUserIds = joinUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); - if (!joinUserIds.isEmpty()){ + if (!joinUser.isEmpty()){ + Set joinUserIds = joinUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); publishFranchiseFeeUsers.addAll(joinUserIds); } List regionUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.REGION_OFFICE, regionId); - Set regionUserIds = regionUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); - if (!regionUserIds.isEmpty()){ - publishFranchiseFeeUsers.addAll(regionUserIds); - } + if (!regionUser.isEmpty()){ + Set regionUserIds = regionUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); + publishFranchiseFeeUsers.addAll(regionUserIds); + } } - HashMap map = new HashMap<>(); map.put("partnerUsername", lineInfo.getUsername()); map.put("partnerMobile", lineInfo.getMobile()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java index 0a3e9f6af..ab4e61080 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java @@ -157,13 +157,13 @@ public class LinePayServiceImpl implements LinePayService { ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(franchiseFeeDO.getShopId()); Set auditFranchiseFeeUsers = new HashSet<>(); List branchUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.BRANCH_OFFICE, shopInfoDO.getRegionId()); - Set branchUserIds = branchUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); - if (!branchUserIds.isEmpty()) { + if (!branchUser.isEmpty()) { + Set branchUserIds = branchUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); auditFranchiseFeeUsers.addAll(branchUserIds); } List regionUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.REGION_OFFICE, shopInfoDO.getRegionId()); - Set regionUserIds = regionUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); - if (!regionUserIds.isEmpty()) { + if (!regionUser.isEmpty()) { + Set regionUserIds = regionUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); auditFranchiseFeeUsers.addAll(regionUserIds); } HashMap map = new HashMap<>(); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java index 09c2e1b9e..d8763cfc8 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java @@ -107,15 +107,16 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService { LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(shopInfoDO.getLineId()); Set planAuditUser = new HashSet<>(); List regionManagerUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.REGION_MANAGER, shopInfoDO.getRegionId()); - Set regionManagerUserIds = regionManagerUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); - if (!regionManagerUserIds.isEmpty()) { + if (!regionManagerUser.isEmpty()){ + Set regionManagerUserIds = regionManagerUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); planAuditUser.addAll(regionManagerUserIds); } List regionalManager = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.REGIONAL_MANAGER, shopInfoDO.getRegionId()); - Set regionalManagerUserIds = regionalManager.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); - if (!regionalManagerUserIds.isEmpty()) { + if (!regionalManager.isEmpty()){ + Set regionalManagerUserIds = regionalManager.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); planAuditUser.addAll(regionalManagerUserIds); } + HashMap map = new HashMap<>(); map.put("partnerUsername",lineInfoDO.getUsername()); map.put("partnerMobile",lineInfoDO.getMobile()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java index 093fbda1b..72e962aeb 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java @@ -111,7 +111,10 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); } List dyCustomerUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.DOU_YIN_CUSTOMER, regionId); - List dyCustomerUserIds = dyCustomerUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()); + List dyCustomerUserIds =new ArrayList<>(); + if(!dyCustomerUser.isEmpty()){ + dyCustomerUserIds.addAll(dyCustomerUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); + } commonService.sendQWMessage(dyCustomerUserIds, MessageEnum.MESSAGE_43, map); @@ -132,7 +135,10 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); } List ksUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.KUAI_SHOU_CUSTOMER, regionId); - List ksUserIds = ksUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()); + List ksUserIds =new ArrayList<>(); + if(!ksUser.isEmpty()){ + ksUserIds.addAll(ksUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); + } commonService.sendQWMessage(ksUserIds, MessageEnum.MESSAGE_47, map); @@ -153,7 +159,10 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); } List mtbcUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.MEI_TUAN_BUY_CUSTOMER, regionId); - List mtbcUserIds = mtbcUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()); + List mtbcUserIds =new ArrayList<>(); + if(!mtbcUser.isEmpty()){ + mtbcUserIds.addAll(mtbcUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); + } commonService.sendQWMessage(mtbcUserIds, MessageEnum.MESSAGE_45, map); @@ -174,7 +183,10 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); } List elmUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.E_L_ME_TUAN_OPERATIONS_CUSTOMER, regionId); - List elmUserIds = elmUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()); + List elmUserIds =new ArrayList<>(); + if(!elmUser.isEmpty()){ + elmUserIds.addAll(elmUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); + } commonService.sendQWMessage(elmUserIds, MessageEnum.MESSAGE_46, map); @@ -195,7 +207,10 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); } List mtocUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.MEI_TUAN_OPERATIONS_CUSTOMER, regionId); - List mtocUserIds = mtocUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()); + List mtocUserIds =new ArrayList<>(); + if(!mtocUser.isEmpty()){ + mtocUserIds.addAll(mtocUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); + } commonService.sendQWMessage(mtocUserIds, MessageEnum.MESSAGE_44, map); @@ -402,7 +417,10 @@ public Integer firstAudit(PlatformBuildAuditRequest request) { doThing(platformBuildDO, request, shopAuditInfoDO, shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_211, SHOP_SUB_STAGE_STATUS_213, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_214); if (request.getResultType().equals(AuditResultTypeEnum.PASS.getCode())) { List elmUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.E_L_ME_HEADQUARTERS_BUILD_CUSTOMER, regionId); - List elmUserIds = elmUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()); + List elmUserIds = new ArrayList<>(); + if(!elmUser.isEmpty()){ + elmUserIds.addAll(elmUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); + } operationLogService.addOperationLog(shopId, SHOP_SUB_STAGE_STATUS_213, request.getOperateUserId(), elmUser, OperationTypeEnum.OPERATION_TYPE_1, null, OperationStatusEnum.NOT_PROCESSED); commonService.sendQWMessage(elmUserIds, @@ -421,7 +439,10 @@ public Integer firstAudit(PlatformBuildAuditRequest request) { doThing(platformBuildDO, request, shopAuditInfoDO, shopId, SHOP_SUB_STAGE_STATUS_191, SHOP_SUB_STAGE_STATUS_193, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_194); if (request.getResultType().equals(AuditResultTypeEnum.PASS.getCode())) { List mtwmUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.MEI_TUAN_HEADQUARTERS_BUILD_CUSTOMER, regionId); - List mtwmUserIds = mtwmUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()); + List mtwmUserIds = new ArrayList<>(); + if (!mtwmUser.isEmpty()){ + mtwmUserIds.addAll( mtwmUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); + } commonService.sendQWMessage(mtwmUserIds, MessageEnum.MESSAGE_49, map); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java index c9870ea3f..f7b3a0869 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java @@ -120,13 +120,13 @@ public class ShopServiceImpl implements ShopService { Integer result = shopStageInfoDAO.initShopStageInfo(lineInfo.getId(), shopIds, true); Set publishFranchiseFeeUsers = new HashSet<>(); List joinUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.JOIN_OFFICE, lineInfo.getRegionId()); - Set joinUserIds = joinUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); - if (!joinUserIds.isEmpty()) { + if (!joinUser.isEmpty()) { + Set joinUserIds = joinUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); publishFranchiseFeeUsers.addAll(joinUserIds); } List regionUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.REGION_OFFICE, lineInfo.getRegionId()); - Set regionUserIds = regionUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); - if (!regionUserIds.isEmpty()) { + if (!regionUser.isEmpty()) { + Set regionUserIds = regionUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); publishFranchiseFeeUsers.addAll(regionUserIds); } HashMap map = new HashMap<>(); @@ -301,13 +301,13 @@ public class ShopServiceImpl implements ShopService { map.put("partnerMobile", lineInfo.getMobile()); Set publishFranchiseFeeUsers = new HashSet<>(); List joinUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.JOIN_OFFICE, request.getRegionId()); - Set joinUserIds = joinUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); - if (!joinUserIds.isEmpty()) { + if (!joinUser.isEmpty()) { + Set joinUserIds = joinUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); publishFranchiseFeeUsers.addAll(joinUserIds); } List regionUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.REGION_OFFICE, request.getRegionId()); - Set regionUserIds = regionUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); - if (!regionUserIds.isEmpty()) { + if (!regionUser.isEmpty()) { + Set regionUserIds = regionUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); publishFranchiseFeeUsers.addAll(regionUserIds); } commonService.sendQWMessage(Collections.singletonList(request.getInvestmentManagerUserId()), diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java index 384e1efa1..e8c57010c 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java @@ -181,7 +181,10 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu map.put("partnerMobile",lineInfoDO.getMobile()); map.put("storeName",shopInfoDO.getShopName()); List userDOList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.FINANCE, shopInfoDO.getRegionId()); - List finances = userDOList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()); + List finances = new ArrayList<>(); + if (!userDOList.isEmpty()){ + finances.addAll(userDOList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())) ; + } commonService.sendQWMessage(finances, MessageEnum.MESSAGE_34, map); From 35444f6cb9634114ab73a74f50fc61ca368b224a Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 19 Feb 2025 16:22:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?add=20=E8=BF=90=E8=90=A5=E6=96=B9=E6=A1=88?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E4=B8=8D=E9=80=9A=E8=BF=87=E7=9A=84=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/enums/MessageEnum.java | 1 + .../impl/AuditOpeningOperationPlanImpl.java | 27 ++++++++++++++----- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java index 57e6a91f1..22381b0b6 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java @@ -75,6 +75,7 @@ public enum MessageEnum { MESSAGE_47("您有一个门店已提交快手建店资料，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"), MESSAGE_48("您有一个门店饿了么初审已通过，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"), MESSAGE_49("您有一个门店美团外卖初审已通过，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"), + MESSAGE_50("您有一个门店开业运营方案审核未通过，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"), ; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditOpeningOperationPlanImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditOpeningOperationPlanImpl.java index 747251303..2f7468e96 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditOpeningOperationPlanImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditOpeningOperationPlanImpl.java @@ -5,13 +5,8 @@ import com.alibaba.fastjson.JSONObject; import com.cool.store.context.CurrentUserHolder; import com.cool.store.context.LoginUserInfo; import com.cool.store.dao.*; -import com.cool.store.entity.EnterpriseUserDO; -import com.cool.store.entity.OpeningOperationPlanDO; -import com.cool.store.entity.ShopAuditInfoDO; -import com.cool.store.enums.AuditResultTypeEnum; -import com.cool.store.enums.AuditTypeEnum; -import com.cool.store.enums.ErrorCodeEnum; -import com.cool.store.enums.OpeningOperationPlanResultTypeEnum; +import com.cool.store.entity.*; +import com.cool.store.enums.*; import com.cool.store.enums.point.ShopSubStageStatusEnum; import com.cool.store.exception.ServiceException; import com.cool.store.request.OpeningOperationPlanAuditRequest; @@ -21,6 +16,9 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; import java.util.Objects; /** @@ -42,6 +40,12 @@ public class AuditOpeningOperationPlanImpl implements AuditOpeningOperationPlanS private PreparationService preparationService; @Resource private ShopAuditInfoDAO shopAuditInfoDAO; + @Resource + private LineInfoDAO lineInfoDAO; + @Resource + private ShopInfoDAO shopInfoDAO; + @Resource + private CommonService commonService; @Override @Transactional(rollbackFor = Exception.class) @@ -67,7 +71,16 @@ public class AuditOpeningOperationPlanImpl implements AuditOpeningOperationPlanS shopSubStageStatusEnum = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_143; flag = Boolean.TRUE; }else { + ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId()); + LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(shopInfo.getLineId()); shopSubStageStatusEnum = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_142; + HashMap map = new HashMap<>(); + map.put("partnerUsername",lineInfoDO.getUsername()); + map.put("partnerMobile",lineInfoDO.getMobile()); + map.put("storeName",shopInfo.getShopName()); + commonService.sendQWMessage(Collections.singletonList(shopInfo.getInvestmentManager()), + MessageEnum.MESSAGE_50, + map); } shopStageInfoDAO.updateShopStageAndAuditInfo(request.getShopId(), shopSubStageStatusEnum, auditId);