diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationMeasureServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationMeasureServiceImpl.java index d2771c142..90fc4eafc 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationMeasureServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationMeasureServiceImpl.java @@ -93,6 +93,8 @@ public class DecorationMeasureServiceImpl implements DecorationMeasureService { shopStageInfoDAO.batchUpdateShopStageStatus(request.getShopId(), Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_862, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_90)); // 给测量员发送企业微信消息 sendMeasureUserMessage(request.getShopId(), request.getMeasureUserId()); + //企微通知设计组长 + sendHeadDesign(request); return Boolean.TRUE; } // 处理状态862->863 @@ -105,23 +107,27 @@ public class DecorationMeasureServiceImpl implements DecorationMeasureService { // 更新设计状态和测量状态 shopStageInfoDAO.batchUpdateShopStageStatus(request.getShopId(), Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_862, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_90)); - // 给测量员发送企业微信消息 - List headOfDesignList = enterpriseUserRoleDao.selectUserIdsByRoleIdList(Arrays.asList(UserRoleEnum.HEAD_OF_DESIGN.getCode())); - sendMeasureUserMessage(request.getShopId(), request.getMeasureUserId()); - ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId()); - LineInfoDO lineInfo = lineInfoMapper.getByLineId(shopInfo.getLineId()); - HashMap map = new HashMap<>(4); - map.put("partnerUsername", lineInfo.getUsername()); - map.put("partnerMobile", lineInfo.getMobile()); - map.put("storeName", shopInfo.getShopName()); - commonService.sendQWMessage(headOfDesignList, - MessageEnum.MESSAGE_58, - map - ); + //企微通知设计组长 + sendHeadDesign(request); } return Boolean.TRUE; } + private void sendHeadDesign(DecorationMeasureRequest request) { + List headOfDesignList = enterpriseUserRoleDao.selectUserIdsByRoleIdList(Arrays.asList(UserRoleEnum.HEAD_OF_DESIGN.getCode())); + sendMeasureUserMessage(request.getShopId(), request.getMeasureUserId()); + ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId()); + LineInfoDO lineInfo = lineInfoMapper.getByLineId(shopInfo.getLineId()); + HashMap map = new HashMap<>(4); + map.put("partnerUsername", lineInfo.getUsername()); + map.put("partnerMobile", lineInfo.getMobile()); + map.put("storeName", shopInfo.getShopName()); + commonService.sendQWMessage(headOfDesignList, + MessageEnum.MESSAGE_58, + map + ); + } + /** * 发送测量消息给测量员 */ 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 25cd4bc46..ca2f1e226 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 @@ -199,9 +199,9 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu commonService.sendQWMessage(liGuiNeiQinList, MessageEnum.MESSAGE_57, map); - commonService.sendQWMessage(Collections.singletonList(shopInfoDO.getInvestmentManager()), - MessageEnum.MESSAGE_35, - map); +// commonService.sendQWMessage(Collections.singletonList(shopInfoDO.getInvestmentManager()), +// MessageEnum.MESSAGE_35, +// map); commonService.sendQWMessage(Collections.singletonList(shopInfoDO.getInvestmentManager()), MessageEnum.MESSAGE_26, map);