feat:合同推送修改

coolstore-partner-common/src/main/java/com/cool/store/enums/FranchiseBrandEnum.java

@@ -14,20 +14,27 @@ import java.util.stream.Collectors;
  * @注释:
  */
 public enum FranchiseBrandEnum {
-    ZXJP(1,"正新鸡排","option486"),
+    ZXJP(1,"正新鸡排","option486","上海正新食品集团有限公司","海南正新多品牌管理有限公司"),
-    ZXSMZ(2,"正新三明治","option622"),
+    ZXSMZ(2,"正新三明治","option622","",""),
-    ZJS(3,"正烧记","option488"),
+    ZJS(3,"正烧记","option488","上海正烧信息科技有限公司","上海正烧信息科技有限公司"),
-    DGMX(4,"大鼓米线","option624"),
+    DGMX(4,"大鼓米线","option624","",""),
-    CXM(5,"串小妹","option626"),
+    CXM(5,"串小妹","option626","",""),
-    MZG(6,"茂掌柜","option490");
+    MZG(6,"茂掌柜","option490","","");
     private int code;
     private String desc;
-    //红圈通code
+    /**法大大合同编号*/
     private String hqtCode;
-    FranchiseBrandEnum(int code, String desc,String hqtCode) {
+    /**品牌方*/
+    private String brandOwner;
+    /**收款方*/
+    private String payeeName;
+
+    FranchiseBrandEnum(int code, String desc,String hqtCode,String brandOwner,String payeeName) {
         this.code = code;
         this.desc = desc;
         this.hqtCode = hqtCode;
+        this.brandOwner = brandOwner;
+        this.payeeName = payeeName;
     }
     public int getCode() {
         return code;
@@ -40,6 +47,14 @@ public enum FranchiseBrandEnum {
         return hqtCode;
     }
 
+    public String getBrandOwner() {
+        return brandOwner;
+    }
+
+    public String getPayeeName() {
+        return payeeName;
+    }
+
     public static String getDescByCode(String code) {
         if (StringUtils.isBlank(code)){
             return null;
@@ -52,6 +67,20 @@ public enum FranchiseBrandEnum {
         }
         return null;
     }
+
+    public static FranchiseBrandEnum getEnumByCode(String code) {
+        if (StringUtils.isBlank(code)){
+            return null;
+        }
+        int i = Integer.parseInt(code);
+        for (FranchiseBrandEnum e : FranchiseBrandEnum.values()) {
+            if (i == e.getCode()) {
+                return e;
+            }
+        }
+        return null;
+    }
+
     public static String getDescByCode(Integer code) {
         if (code==null){
             return null;

coolstore-partner-model/src/main/java/com/cool/store/dto/ContractInformationDTO.java

@@ -37,7 +37,9 @@ public class ContractInformationDTO {
     private String  firstYearFee;
     @ApiModelProperty("设计费")
     private String performanceBond;
-    @ApiModelProperty("合同配置信息")
+    @ApiModelProperty("收款方名称")
-    private List<PushContractDTO> contractList;
+    private String payeeName;
+    @ApiModelProperty("品牌方")
+    private String brandOwner;
 
 }

coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java

@@ -428,25 +428,14 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
                     contractInformationDTO.setFirstYearFee(franchiseFeeDO.getFirstYearFee());
                     contractInformationDTO.setPerformanceBond(franchiseFeeDO.getPerformanceBond());
 
-                    List<ContractConfigDO> contractConfigDOS = contractConfigDAO.queryContractConfigListByBrandAndMode(shopInfoDO.getFranchiseBrand(), JoinModeEnum.getByCode(shopInfoDO.getJoinMode()));
+                    FranchiseBrandEnum enumByCode = FranchiseBrandEnum.getEnumByCode(shopInfoDO.getFranchiseBrand());
-
+                    if (enumByCode != null){
-                    if (CollectionUtils.isNotEmpty(contractConfigDOS)){
+                        contractInformationDTO.setPayeeName(enumByCode.getPayeeName());
-                        contractInformationDTO.setContractList(contractConfigDOS.stream().map(contractConfigDO -> {
+                        contractInformationDTO.setBrandOwner(enumByCode.getBrandOwner());
-                            PushContractDTO pushContractDTO = new PushContractDTO();
-                            pushContractDTO.setBrand(contractConfigDO.getBrand());
-                            pushContractDTO.setContractName(contractConfigDO.getContractName());
-                            pushContractDTO.setPartyA(contractConfigDO.getPartyA());
-                            pushContractDTO.setPartyB(contractConfigDO.getPartyB());
-                            pushContractDTO.setPartyC(contractConfigDO.getPartyC());
-                            pushContractDTO.setFadadaTemplateId(contractConfigDO.getFadadaTemplateId());
-                            pushContractDTO.setSerialNumber(contractConfigDO.getSerialNumber());
-                            pushContractDTO.setPayeeName(contractConfigDO.getPayeeName());
-                            return pushContractDTO;
-                        }).collect(Collectors.toList()));
-
                     }
 
 
+
                     log.info("加盟合同审批时签约类型:{}", SignTypeEnum.getDescByCode(signFranchiseDO.getSignType()));
                     Boolean sendNotice = Boolean.TRUE;
                     commonService.sendSms(lineInfoDO.getMobile(), SMSMsgEnum.SIGN_CONTRACT);