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 22381b0b6..c7c545e0c 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 @@ -34,7 +34,7 @@ public enum MessageEnum { MESSAGE_10_1("您的线索已预约二次面审,请关注", "##### 加盟商姓名:${partnerUsername}\n面审官:${interviewUsername}\n##### 预约时间:${appointmentTime}\n"), MESSAGE_11("您的一个铺位已审核通过,请查收", "##### 铺位名称:${pointName}\n##### 铺位地址:${pointAddress}\n"), MESSAGE_12("您的一个铺位审核未通过,请查收", "##### 铺位名称:${pointName}\n##### 铺位地址:${pointAddress}\n##### 未通过原因:${reason}\n"), - MESSAGE_13("您有一个铺位需要审核,请查收", "##### 铺位名称:${pointName}\n##### 铺位地址:${pointAddress}\n"), + MESSAGE_13("您有一个铺位需要审核,请查收", "铺位名称:${pointName}\n铺位地址:${pointAddress}"), MESSAGE_14("已为您分配一位加盟商,待推送铺位,请查收", "加盟商姓名:${partnerUsername}\n手机号码:${partnerMobile}\n"), MESSAGE_15("您有一份加盟商上传的租赁合同待审核,请查收", " 加盟商姓名:${partnerUsername}\n手机号码:${partnerMobile}\n"), MESSAGE_16("您有一家门店待提交系统建店申请,请查收", "##### 门店名称:${storeName}\n##### 加盟商姓名:${partnerUsername}\n##### 加盟商手机号码:${partnerMobile}\n"), @@ -76,6 +76,7 @@ public enum MessageEnum { MESSAGE_48("您有一个门店饿了么初审已通过,请查收","门店名称:${storeName}\n加盟商姓名:${partnerUsername}\n加盟商手机号码:${partnerMobile}\n"), MESSAGE_49("您有一个门店美团外卖初审已通过,请查收","门店名称:${storeName}\n加盟商姓名:${partnerUsername}\n加盟商手机号码:${partnerMobile}\n"), MESSAGE_50("您有一个门店开业运营方案审核未通过,请查收","门店名称:${storeName}\n加盟商姓名:${partnerUsername}\n加盟商手机号码:${partnerMobile}\n"), + MESSAGE_51("您有一个加盟商提交了铺位,请查收","铺位名称:${pointName}\n加盟商姓名:${partnerUsername}\n加盟商手机号码:${partnerMobile}\n"), ; 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 5b9275ae2..04b613c5b 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 @@ -344,11 +344,10 @@ public class PointServiceImpl implements PointService { //审批通过的情况下 生成下一个节点的待办数据 pointTodoInfoDAO.addPointTodoInfo(PointAuditRecordDO.convertTODO(nextAuditRecord)); List sendMessageUserIds = JSONObject.parseArray(nextAuditRecord.getHandlerUserIds(), String.class); - Map messageMap = new HashMap<>(); - messageMap.put("pointId", String.valueOf(pointInfo.getId())); - messageMap.put("pointName", pointInfo.getPointName()); - messageMap.put("pointAddress", pointInfo.getAddress()); - commonService.sendMessage(sendMessageUserIds, MessageEnum.MESSAGE_13, messageMap); + HashMap map = new HashMap<>(); + map.put("pointName",pointInfo.getPointName()) ; + map.put("pointAddress",pointInfo.getAddress()) ; + commonService.sendQWMessage(sendMessageUserIds, MessageEnum.MESSAGE_13, map); }else{ PointInfoDO updatePoint = new PointInfoDO(); updatePoint.setId(pointInfo.getId()); @@ -362,7 +361,7 @@ public class PointServiceImpl implements PointService { messageMap.put("pointId", String.valueOf(pointInfo.getId())); messageMap.put("pointName", pointInfo.getPointName()); messageMap.put("pointAddress", pointInfo.getAddress()); - commonService.sendMessage(Arrays.asList(pointInfo.getDevelopmentManager()), MessageEnum.MESSAGE_11, messageMap); + commonService.sendQWMessage(Arrays.asList(pointInfo.getDevelopmentManager()), MessageEnum.MESSAGE_11, messageMap); result = pointInfoDAO.updatePointInfo(updatePoint); } return result; @@ -387,7 +386,7 @@ public class PointServiceImpl implements PointService { messageMap.put("pointName", pointInfo.getPointName()); messageMap.put("pointAddress", pointInfo.getAddress()); messageMap.put("reason", reason); - commonService.sendMessage(Arrays.asList(pointInfo.getDevelopmentManager()), MessageEnum.MESSAGE_12, messageMap); + commonService.sendQWMessage(Arrays.asList(pointInfo.getDevelopmentManager()), MessageEnum.MESSAGE_12, messageMap); return pointInfoDAO.updatePointInfo(pointInfoUpdate); } @@ -795,6 +794,15 @@ public class PointServiceImpl implements PointService { } updateStatusList.add(selectStatus); shopStageInfoDAO.batchUpdateShopStageStatus(shopId, updateStatusList); + if (selectStatus.equals( ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_11)){ + LineInfoDO lineInfo = lineInfoDAO.getLineInfo(lineId); + HashMap map = new HashMap<>(); + map.put("pointName",pointInfo.getPointName()) ; + map.put("pointAddress",pointInfo.getAddress()); + commonService.sendQWMessage(Collections.singletonList(shopInfo.getInvestmentManager()), + MessageEnum.MESSAGE_13, + map); + } return pointRecommendDAO.updateStatusByPointIdAndLineId(pointId, shopId); } catch (ServiceException e) { throw e; @@ -853,6 +861,13 @@ public class PointServiceImpl implements PointService { updatePoint.setId(pointId); updatePoint.setShopId(shopInfo.getId()); pointInfoDAO.updatePointInfo(updatePoint); + HashMap map = new HashMap<>(); + map.put("partnerUsername",lineInfo.getUsername()); + map.put("partnerMobile",lineInfo.getMobile()); + map.put("pointName",pointInfo.getPointName()) ; + commonService.sendQWMessage(Collections.singletonList(shopInfo.getInvestmentManager()), + MessageEnum.MESSAGE_51, + map); return pointId; }