加盟合同增加字段+导出字段增加

coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml

@@ -24,7 +24,8 @@
         a.first_year_start_time as firstYearStartTime,
         a.first_year_end_time as firstYearEndTime,
         a.first_year_fee as firstYearFee,
-        a.performance_bond as performanceBond
+        a.performance_bond as performanceBond,
+        b.pay_user_name as payUserName
         from xfsg_franchise_fee a
         LEFT JOIN xfsg_line_pay b ON b.id = a.pay_id
         where a.shop_id in

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

@@ -83,6 +83,15 @@ public class ExportBranchShopDTO {
     @ExcelProperty(value = "签约时间",order =17)
     @ColumnWidth(30)
     private String signTime ;
+
+    @ExcelProperty(value = "合伙签约人1",order =17)
+    @ColumnWidth(30)
+    private String partnershipSignatoryFirst ;
+
+    @ExcelProperty(value = "合伙签约人2",order =17)
+    @ColumnWidth(30)
+    private String partnershipSignatorySecond ;
+
     @ExcelProperty(value = "合同金额",order =18)
     @ColumnWidth(30)
     private String contractAmount;
@@ -143,6 +152,10 @@ public class ExportBranchShopDTO {
     @ColumnWidth(30)
     private String designFee;
 
+    @ExcelProperty(value = "缴款人",order = 33)
+    @ColumnWidth(30)
+    private String payUserName;
+
     @ExcelProperty(value = "第1次缴纳时间",order = 33)
     @ColumnWidth(30)
     private String firstPayTime;

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

@@ -36,5 +36,6 @@ public class FranchiseFeeDTO {
     private String combinedField;
 
     private List<Date> payTimeList;
-
+    //付款人
+    private String payUserName;
 }

coolstore-partner-model/src/main/java/com/cool/store/entity/SignFranchiseDO.java

@@ -56,4 +56,8 @@ public class SignFranchiseDO {
     private String contractCode;
     @Column(name = "contract_amount")
     private String contractAmount;
+    @Column(name = "partnership_signatory_first")
+    private String partnershipSignatoryFirst;
+    @Column(name = "partnership_signatory_second")
+    private String partnershipSignatorySecond;
 }

coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java

@@ -67,6 +67,10 @@ public class AddSignFranchiseRequest {
     private String contractCode;
     @ApiModelProperty("合同金额")
     private String contractAmount;
+    @ApiModelProperty("合伙签约人1")
+    private String partnershipSignatoryFirst;
+    @ApiModelProperty("合伙签约人2")
+    private String partnershipSignatorySecond;
 
 
     public SignFranchiseDO toSignFranchiseDO() {
@@ -88,6 +92,8 @@ public class AddSignFranchiseRequest {
         signFranchiseDO.setMobile(this.mobile);
         signFranchiseDO.setContractCode(this.contractCode);
         signFranchiseDO.setContractAmount(this.contractAmount);
+        signFranchiseDO.setPartnershipSignatoryFirst(this.partnershipSignatoryFirst);
+        signFranchiseDO.setPartnershipSignatorySecond(this.partnershipSignatorySecond);
         return signFranchiseDO;
     }
 

coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java

@@ -165,5 +165,10 @@ public class AddSignFranchiseResponse {
     @ApiModelProperty("合同金额")
     private String contractAmount;
 
+    @ApiModelProperty("合伙签约人1")
+    private String partnershipSignatoryFirst;
+    @ApiModelProperty("合伙签约人2")
+    private String partnershipSignatorySecond;
+
 
 }

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

@@ -153,6 +153,7 @@ public class ExportRealizeServiceImpl implements ExportRealizeService {
                     dto.setPerformanceBondBill(franchiseFeeDTO.getPerformanceBond());
                     dto.setFirstYearManagementFeeBill(franchiseFeeDTO.getFirstYearManagementFee());
                     dto.setFirstYearBrandingFeeBill(franchiseFeeDTO.getFirstYearFee());
+                    dto.setPayUserName(franchiseFeeDTO.getPayUserName());
                 }
                 dto.setUserName(response.getUsername());
                 dto.setMobile(response.getMobile());
@@ -169,6 +170,8 @@ public class ExportRealizeServiceImpl implements ExportRealizeService {
                     dto.setContractStartTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, signFranchiseDO.getContractStartTime()));
                     dto.setContractEndTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, signFranchiseDO.getContractEndTime()));
                     dto.setSignTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, signFranchiseDO.getCreateTime()));
+                    dto.setPartnershipSignatoryFirst(signFranchiseDO.getPartnershipSignatoryFirst());
+                    dto.setPartnershipSignatorySecond(signFranchiseDO.getPartnershipSignatorySecond());
                 }
                 List<Date> payTime = payTimeMap.getOrDefault(response.getShopId(), new ArrayList<>());
                 for (int i = 0; i < payTime.size() && i <= 3; i++) {

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

@@ -288,6 +288,8 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
             addSignFranchiseResponse.setMobile(signFranchiseDO.getMobile());
             addSignFranchiseResponse.setContractCode(signFranchiseDO.getContractCode());
             addSignFranchiseResponse.setContractAmount(signFranchiseDO.getContractAmount());
+            addSignFranchiseResponse.setPartnershipSignatoryFirst(signFranchiseDO.getPartnershipSignatoryFirst());
+            addSignFranchiseResponse.setPartnershipSignatorySecond(signFranchiseDO.getPartnershipSignatorySecond());
 
         } else {
             BigDecimal total = new BigDecimal(franchiseFeeDO.getYearFranchiseFee())