Merge remote-tracking branch 'origin/cc_partner_init' into cc_partner_init

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&timestamp=" + 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&timestamp=" + 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&timestamp=" + 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&timestamp="+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&timestamp="+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&timestamp=" + 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&timestamp=" + 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&timestamp=" + 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&timestamp=" + System.currentTimeMillis() +"&lineId="+ paramMap.get("lineId")+"&shopId="+ paramMap.get("shopId"), StandardCharsets.UTF_8.name());
                 default:
                     return "";
             }

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<String> sendUsers = new ArrayList<>();
             //如果没有督导，则发送给管辖此区域的所有战区经理

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());

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<String, String> 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;
     }

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())) {

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);

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.*;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -70,7 +68,16 @@ public class ShopServiceImpl implements ShopService {
         }
         shopInfoDAO.batchAddShop(addShopList);
         List<Long> shopIds = addShopList.stream().map(ShopInfoDO::getId).collect(Collectors.toList());
-        return shopStageInfoDAO.initShopStageInfo(lineInfo.getId(), shopIds);
+        Integer result = shopStageInfoDAO.initShopStageInfo(lineInfo.getId(), shopIds);
+        Map<String, String> 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

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);