优化：开店管理导出

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

@@ -50,68 +50,117 @@ public class ExportBranchShopDTO {
     @ColumnWidth(30)
     private String contractCode;
 
-    @ExcelProperty(value = "合同开始时间",order = 9)
+    @ExcelProperty(value = "第一年加盟开始时间",order = 9)
+    @ColumnWidth(30)
+    private String firstYearStartTime;
+
+    @ExcelProperty(value = "第一年加盟开始时间",order = 9)
+    @ColumnWidth(30)
+    private String firstYearEndTime;
+
+    @ExcelProperty(value = "合同开始时间",order = 11)
     @ColumnWidth(30)
     private String contractStartTime;
 
-    @ExcelProperty(value = "合同结束时间",order = 10)
+    @ExcelProperty(value = "合同结束时间",order = 12)
     @ColumnWidth(30)
     private String contractEndTime;
 
-    @ExcelProperty(value = "开票时间",order = 11)
+    @ExcelProperty(value = "开票时间",order = 13)
     @ColumnWidth(30)
     private String invoicingTime;
 
-    @ExcelProperty(value = "管理费(含税金额)",order = 12)
+    @ExcelProperty(value = "币种",order = 14)
     @ColumnWidth(30)
-    private String managementFeeTax;
+    private String currency;
 
-    @ExcelProperty(value = "管理费(不含税金额)",order = 13)
+    @ExcelProperty(value = "合计缴费金额（取自账单）",order = 15)
     @ColumnWidth(30)
-    private String managementFee;
+    private String totalAmountContributions;
 
-    @ExcelProperty(value = "品牌费(含税金额)",order = 14)
+    @ExcelProperty(value = "加盟费（取自账单）",order = 16)
     @ColumnWidth(30)
-    private String brandingFeeTax;
+    private String franchiseFeeBill;
 
-    @ExcelProperty(value = "品牌费(不含税金额)",order = 15)
-    @ColumnWidth(30)
-    private String brandingFee;
-
-    @ExcelProperty(value = "加盟费(含税金额)",order = 16)
+    @ExcelProperty(value = "加盟费(含税金额)",order = 18)
     @ColumnWidth(30)
     private String franchiseFeeTax;
 
-    @ExcelProperty(value = "加盟费(不含税金额)",order = 17)
+    @ExcelProperty(value = "加盟费(不含税金额)",order = 19)
     @ColumnWidth(30)
     private String franchiseFee;
 
-    @ExcelProperty(value = "设计费(含税金额)",order = 18)
+    @ExcelProperty(value = "保证金（取自账单）",order = 20)
+    @ColumnWidth(30)
+    private String loanMargin;
+
+    @ExcelProperty(value = "第一年度管理费（取自账单）",order = 21)
+    @ColumnWidth(30)
+    private String firstYearManagementFeeBill;
+
+    @ExcelProperty(value = "第一年度管理费(含税金额)",order = 22)
+    @ColumnWidth(30)
+    private String firstYearManagementFeeTax;
+
+    @ExcelProperty(value = "第一年度管理费(不含税金额)",order = 23)
+    @ColumnWidth(30)
+    private String firstYearManagementFee;
+
+    @ExcelProperty(value = "第一年度品牌费（取自账单）",order = 24)
+    @ColumnWidth(30)
+    private String firstYearBrandingFeeBill;
+
+    @ExcelProperty(value = "第一年度品牌费(含税金额)",order = 25)
+    @ColumnWidth(30)
+    private String firstYearBrandingFeeTax;
+
+    @ExcelProperty(value = "第一年度品牌费(不含税金额)",order = 26)
+    @ColumnWidth(30)
+    private String firstYearBrandingFee;
+
+    @ExcelProperty(value = "设计费（取自账单)",order = 27)
+    @ColumnWidth(30)
+    private String performanceBondBill;
+
+    @ExcelProperty(value = "设计费(含税金额)",order = 28)
     @ColumnWidth(30)
     private String designFeeTax;
 
-    @ExcelProperty(value = "设计费(不含税金额)",order = 19)
+    @ExcelProperty(value = "设计费(不含税金额)",order = 29)
     @ColumnWidth(30)
     private String designFee;
 
-    @ExcelProperty(value = "当前进度",order = 20)
+    @ExcelProperty(value = "第1次缴纳时间",order = 30)
+    @ColumnWidth(30)
+    private String firstPayTime;
+
+    @ExcelProperty(value = "第2次缴纳时间",order = 31)
+    @ColumnWidth(30)
+    private String secondPayTime;
+
+    @ExcelProperty(value = "第3次缴纳时间",order = 32)
+    @ColumnWidth(30)
+    private String thirdPayTime;
+
+    @ExcelProperty(value = "第4次缴纳时间",order = 33)
+    @ColumnWidth(30)
+    private String fourthPayTime;
+
+    @ExcelProperty(value = "当前进度",order = 34)
     @ColumnWidth(30)
     private String currentProgress;
 
-    @ExcelProperty(value = "状态",order = 21)
+    @ExcelProperty(value = "状态",order = 35)
     @ColumnWidth(30)
     private String shopStatus;
 
-    @ExcelProperty(value = "计划开店时间",order = 22)
+    @ExcelProperty(value = "计划开店时间",order = 36)
     @ColumnWidth(30)
     private String planOpenTime;
 
-    @ExcelProperty(value = "开店时长(天)",order = 23)
+    @ExcelProperty(value = "开店时长(天)",order =37)
     @ColumnWidth(30)
     private String openDuration;
 
-    @ExcelProperty(value = "缴费时间",order = 24)
-    @ColumnWidth(30)
-    private String payTime;
 
 }

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

@@ -2,6 +2,7 @@ package com.cool.store.dto;
 
 import lombok.Data;
 
+import javax.persistence.Column;
 import java.util.Date;
 
 /**
@@ -16,4 +17,16 @@ public class FranchiseFeeDTO {
     private Long shopId;
 
     private Date  payTime;
+
+    private String yearFranchiseFee;
+
+    private String loanMargin;
+
+    private Date firstYearStartTime;
+
+    private Date firstYearEndTime;
+
+    private String  firstYearFee;
+
+    private String performanceBond;
 }