From ba7e5c978d44a90c0c1fce9a69e117000f3d6d5b Mon Sep 17 00:00:00 2001 From: guohb Date: Tue, 28 May 2024 19:08:35 +0800 Subject: [PATCH] message --- .../com/cool/store/enums/MessageEnum.java | 23 +++++++++++-------- .../service/impl/ApplyLicenseServiceImpl.java | 1 + .../service/impl/FranchiseFeeServiceImpl.java | 1 + .../impl/LineInterviewServiceImpl.java | 7 ------ .../service/impl/LinePayServiceImpl.java | 1 + .../store/service/impl/PointServiceImpl.java | 1 + .../store/service/impl/ShopServiceImpl.java | 17 ++++++++++---- .../impl/SignFranchiseServiceImpl.java | 1 + 8 files changed, 31 insertions(+), 21 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 4da5a0baa..c6c7fdbc2 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 @@ -123,11 +123,6 @@ public enum MessageEnum { return "dingtalk://dingtalkclient/action/open_micro_app?appId=" + appId + "&corpId=" + corpId + "&page=" + URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=franchiseeDetails×tamp=" + System.currentTimeMillis() + "&lineId=" + paramMap.get("lineId"), StandardCharsets.UTF_8.name()); case MESSAGE_15: - case MESSAGE_16: - case MESSAGE_18: - case MESSAGE_19: - case MESSAGE_20: - case MESSAGE_23: case MESSAGE_10_1: case MESSAGE_31: case MESSAGE_32: @@ -135,9 +130,6 @@ public enum MessageEnum { //跳转我的加盟商的加盟商详情都可以使用这个 return domainUrl + "/dd-noticemsg?appId=" + appId + "&corpId=" + corpId + "&appUrl=" + URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=franchiseeDetails×tamp=" + System.currentTimeMillis() + "&lineId=" + paramMap.get("lineId"), StandardCharsets.UTF_8.name()); - case MESSAGE_17: - return domainUrl + "/dd-noticemsg?appId=" + appId + "&corpId=" + corpId + "&appUrl=" + - URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=license×tamp=" + System.currentTimeMillis() + "&shopId=" + paramMap.get("shopId"), StandardCharsets.UTF_8.name()); case MESSAGE_21: return domainUrl + "/dd-noticemsg?appId="+appId+"&corpId="+corpId+"&page=" + URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=employeeTraining×tamp="+System.currentTimeMillis()+"&userDetailId="+ paramMap.get("userDetailId"), StandardCharsets.UTF_8.name()); @@ -159,7 +151,20 @@ public enum MessageEnum { case MESSAGE_28: return "dingtalk://dingtalkclient/action/open_micro_app?appId="+appId+"&corpId="+corpId+"&page=" + URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=eyeAcceptance×tamp="+System.currentTimeMillis()+"&shopId="+ paramMap.get("shopId"), StandardCharsets.UTF_8.name()); - + case MESSAGE_16: + return domainUrl + "/dd-noticemsg?appId=" + appId + "&corpId=" + corpId + "&appUrl=" + + URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=sysStoreSchedule×tamp=" + System.currentTimeMillis() +"&lineId="+ paramMap.get("lineId")+"&shopId="+ paramMap.get("shopId"), StandardCharsets.UTF_8.name()); + case MESSAGE_17: + return domainUrl + "/dd-noticemsg?appId=" + appId + "&corpId=" + corpId + "&appUrl=" + + URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=licenseSchedule×tamp=" + System.currentTimeMillis() +"&lineId="+ paramMap.get("lineId")+"&shopId="+ paramMap.get("shopId"), StandardCharsets.UTF_8.name()); + case MESSAGE_18: + case MESSAGE_23: + return domainUrl + "/dd-noticemsg?appId=" + appId + "&corpId=" + corpId + "&appUrl=" + + URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=franchiseeSchedule×tamp=" + System.currentTimeMillis() +"&lineId="+ paramMap.get("lineId")+"&shopId="+ paramMap.get("shopId"), StandardCharsets.UTF_8.name()); + case MESSAGE_19: + case MESSAGE_20: + return domainUrl + "/dd-noticemsg?appId=" + appId + "&corpId=" + corpId + "&appUrl=" + + URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=contractSchedule×tamp=" + System.currentTimeMillis() +"&lineId="+ paramMap.get("lineId")+"&shopId="+ paramMap.get("shopId"), StandardCharsets.UTF_8.name()); default: return ""; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java index ce36a5bd1..59fc74506 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java @@ -111,6 +111,7 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { requestMap.put("storeName", shopInfoDO.getShopName()); requestMap.put("partnerName", lineInfoDO.getUsername()); requestMap.put("partnerMobile", lineInfoDO.getMobile()); + requestMap.put("lineId", String.valueOf(lineInfoDO.getId())); log.info("submitLicense SMS requestMap:{}", JSONObject.toJSONString(requestMap)); List sendUsers = new ArrayList<>(); //如果没有督导，则发送给管辖此区域的所有战区经理 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 20759769f..b698ef104 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 @@ -120,6 +120,7 @@ public class FranchiseFeeServiceImpl implements FranchiseFeeService { requestMap.put("partnerName", lineInfo.getUsername()); requestMap.put("partnerMobile", lineInfo.getMobile()); requestMap.put("lineId", String.valueOf(lineInfo.getId())); + requestMap.put("shopId", String.valueOf(shopInfoDO.getId())); commonService.sendMessage(Collections.singletonList(lineInfo.getInvestmentManager()), MessageEnum.MESSAGE_19, requestMap); } else if (Constants.ONE_INTEGER.equals(request.getStatus())) { shopAuditInfoDO.setRejectReason(request.getResult()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java index 49c15cb63..14e1ff89d 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java @@ -486,13 +486,6 @@ public class LineInterviewServiceImpl extends LineFlowService implements LineInt messageMap.put("partnerMobile", lineInfo.getMobile()); messageMap.put("wantShopName", wantShopName); commonService.sendMessage(Arrays.asList(developmentManager), MessageEnum.MESSAGE_14, messageMap); - Map requestMap = new HashMap<>(); - //todo 建店还未开始时 - requestMap.put("storeName","XXX"); - requestMap.put("partnerName",lineInfo.getUsername()); - requestMap.put("partnerMobile",lineInfo.getMobile()); - requestMap.put("lineId",String.valueOf(lineInfo.getId())); - commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()),MessageEnum.MESSAGE_23,requestMap); } return lineInterviewDAO.updateInterviewInfo(updateInterviewInfo) > 0; } 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 4f6042c75..3044faf77 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 @@ -103,6 +103,7 @@ public class LinePayServiceImpl implements LinePayService { requestMap.put("partnerName",lineInfo.getUsername()); requestMap.put("partnerMobile",lineInfo.getMobile()); requestMap.put("lineId",String.valueOf(lineInfo.getId())); + requestMap.put("shopId",String.valueOf(shopInfoDO.getId())); commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()), MessageEnum.MESSAGE_18,requestMap); } if (PayBusinessTypeEnum.INTENT_MONEY.getCode().equals(request.getPayBusinessType())) { 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 e8bea21db..821d0d6d0 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 @@ -977,6 +977,7 @@ public class PointServiceImpl implements PointService { requestMap.put("partnerName",lineInfo.getUsername()); requestMap.put("partnerMobile",lineInfo.getMobile()); requestMap.put("lineId",String.valueOf(lineInfo.getId())); + requestMap.put("shopId",String.valueOf(shopId)); if (Objects.nonNull(shopInfo.getShopName())) { requestMap.put("storeName",shopInfo.getShopName()); commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()),MessageEnum.MESSAGE_16,requestMap); 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 de121ae07..854d21c64 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 @@ -3,6 +3,7 @@ package com.cool.store.service.impl; import com.cool.store.dao.*; import com.cool.store.entity.*; import com.cool.store.enums.ErrorCodeEnum; +import com.cool.store.enums.MessageEnum; import com.cool.store.enums.SMSMsgEnum; import com.cool.store.enums.point.*; import com.cool.store.exception.ServiceException; @@ -17,10 +18,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Objects; +import java.util.*; import java.util.stream.Collectors; /** @@ -70,7 +68,16 @@ public class ShopServiceImpl implements ShopService { } shopInfoDAO.batchAddShop(addShopList); List shopIds = addShopList.stream().map(ShopInfoDO::getId).collect(Collectors.toList()); - return shopStageInfoDAO.initShopStageInfo(lineInfo.getId(), shopIds); + Integer result = shopStageInfoDAO.initShopStageInfo(lineInfo.getId(), shopIds); + Map requestMap = new HashMap<>(); + for (Long shopId : shopIds) { + requestMap.put("partnerName",lineInfo.getUsername()); + requestMap.put("partnerMobile",lineInfo.getMobile()); + requestMap.put("lineId",String.valueOf(lineInfo.getId())); + requestMap.put("shopId",String.valueOf(shopId)); + commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()), MessageEnum.MESSAGE_23,requestMap); + } + return result; } @Override 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 7a27e0f7d..a61bd66b4 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 @@ -105,6 +105,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu requestMap.put("partnerName", lineInfo.getUsername()); requestMap.put("partnerMobile", lineInfo.getMobile()); requestMap.put("lineId", String.valueOf(lineInfo.getId())); + requestMap.put("shopId", String.valueOf(shopInfoDO.getId())); commonService.sendMessage(Collections.singletonList(lineInfo.getInvestmentManager()), MessageEnum.MESSAGE_20, requestMap); } else if (Constants.ONE_INTEGER.equals(request.getAuditResult())) { shopAuditInfoDO.setResultType(Constants.ZERO_INTEGER);