feat:密码数据处理，验签排除空字符串，导出接口

2025-04-28 22:24:49 +08:00
parent 6da34ba779
commit bd80c5477f
48 changed files with 1532 additions and 233 deletions
--- a/coolstore-partner-model/src/main/java/com/cool/store/dto/DeclareGoodsDateDTO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/DeclareGoodsDateDTO.java
@@ -15,6 +15,6 @@ public class DeclareGoodsDateDTO {
    @ApiModelProperty(value = "报货日期，例如：星期一（星期六，星期天）/每月1号")
    private String declareGoods;

-    @ApiModelProperty(value = "报货日期，例如：星期一（星期六，星期天）/每月1号")
+    @ApiModelProperty(value = "送货日期，例如：星期一（星期六，星期天）/每月1号")
    private String deliverGoods;
 }
--- a/coolstore-partner-model/src/main/java/com/cool/store/dto/ExportFinanceDTO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/ExportFinanceDTO.java
@@ -0,0 +1,165 @@
+package com.cool.store.dto;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author: WangShuo
+ * @Date: 2025/04/28/17:29
+ * @Version 1.0
+ * @注释:
+ */
+@Data
+public class ExportFinanceDTO {
+
+    @ExcelProperty(value = "门店编码", order = 1)
+    @ColumnWidth(20)
+    private String shopCode;
+
+    @ExcelProperty(value = "签约门店名称", order = 2)
+    @ColumnWidth(25)
+    private String shopName;
+
+    @ExcelProperty(value = "所属品牌", order = 3)
+    @ColumnWidth(20)
+    private String franchiseBrand;
+
+    @ExcelProperty(value = "加盟模式", order = 4)
+    @ColumnWidth(20)
+    private String joinMode;
+
+    @ExcelProperty(value = "加盟商姓名", order = 5)
+    @ColumnWidth(20)
+    private String username;
+
+    @ExcelProperty(value = "加盟商手机号", order = 6)
+    @ColumnWidth(20)
+    private String mobile;
+
+    @ExcelProperty(value = "所属大区", order = 7)
+    @ColumnWidth(20)
+    private String regionName;
+
+    @ExcelProperty(value = "督导", order = 8)
+    @ColumnWidth(20)
+    private String investmentManagerName;
+
+    @ExcelProperty(value = "签约人1姓名", order = 9)
+    @ColumnWidth(20)
+    private String partnershipSignatoryFirst;
+
+    @ExcelProperty(value = "签约人1手机号", order = 10)
+    @ColumnWidth(20)
+    private String partnershipSignatoryFirstMobile;
+
+    @ExcelProperty(value = "签约人1身份证号码", order = 11)
+    @ColumnWidth(30)
+    private String partnershipSignatoryFirstIdCard;
+
+    @ExcelProperty(value = "签约人2姓名", order = 12)
+    @ColumnWidth(20)
+    private String partnershipSignatorySecond;
+
+    @ExcelProperty(value = "签约人2手机号", order = 13)
+    @ColumnWidth(20)
+    private String partnershipSignatorySecondMobile;
+
+    @ExcelProperty(value = "签约人2身份证号码", order = 14)
+    @ColumnWidth(30)
+    private String partnershipSignatorySecondIdCard;
+
+    @ExcelProperty(value = "合同编号", order = 15)
+    @ColumnWidth(20)
+    private String contractCode;
+
+    @ExcelProperty(value = "签约时间", order = 16)
+    @ColumnWidth(20)
+    private String signTime;
+
+    @ExcelProperty(value = "第一年加盟开始日期", order = 17)
+    @ColumnWidth(30)
+    private String firstYearStartTime;
+
+    @ExcelProperty(value = "第一年管理费到期日期", order = 18)
+    @ColumnWidth(30)
+    private String firstYearEndTime;
+
+    @ExcelProperty(value = "加盟费（含税）", order = 19)
+    @ColumnWidth(20)
+    private String franchiseFee;
+
+    @ExcelProperty(value = "第一年度管理费（含税）", order = 20)
+    @ColumnWidth(40)
+    private String firstYearManagementFee;
+
+    @ExcelProperty(value = "设计费（含税）", order = 21)
+    @ColumnWidth(20)
+    private String performanceBond;
+
+    @ExcelProperty(value = "保证金（含税）", order = 22)
+    @ColumnWidth(20)
+    private String loanMargin;
+
+    @ExcelProperty(value = "第一年度品牌使用费（含税）", order = 23)
+    @ColumnWidth(40)
+    private String firstYearFee;
+
+    @ExcelProperty(value = "合计缴费金额（含税）", order = 24)
+    @ColumnWidth(30)
+    private String totalAmountContributions;
+
+    @ExcelProperty(value = "加盟费优惠原因", order = 25)
+    @ColumnWidth(30)
+    private String discountReason;
+
+    @ExcelProperty(value = "合同金额", order = 26)
+    @ColumnWidth(20)
+    private String contractAmount;
+
+    @ExcelProperty(value = "缴款人", order = 27)
+    @ColumnWidth(20)
+    private String payUserName;
+
+    @ExcelProperty(value = "第1次缴纳时间", order = 28)
+    @ColumnWidth(20)
+    private String firstPayTime;
+
+    @ExcelProperty(value = "第2次缴纳时间", order = 29)
+    @ColumnWidth(30)
+    private String secondPayTime;
+
+    @ExcelProperty(value = "第3次缴纳时间", order = 30)
+    @ColumnWidth(30)
+    private String thirdPayTime;
+
+    @ExcelProperty(value = "第4次缴纳时间", order = 31)
+    @ColumnWidth(30)
+    private String fourthPayTime;
+
+    @ExcelProperty(value = "店铺地址", order = 32)
+    @ColumnWidth(40)
+    private String shopAddress;
+
+    @ExcelProperty(value = "阶段状态-缴纳加盟费/保证金", order = 33)
+    @ColumnWidth(40)
+    private String franchiseFeeStageStatus;
+
+    @ExcelProperty(value = "阶段状态-加盟合同签约", order = 34)
+    @ColumnWidth(30)
+    private String signFranchiseStageStatus;
+
+    @ExcelProperty(value = "阶段状态-建店资料收集", order = 35)
+    @ColumnWidth(30)
+    private String buildInformationStatus;
+
+    @ExcelProperty(value = "当前进度", order = 36)
+    @ColumnWidth(20)
+    private String currentProgress;
+
+    @ExcelProperty(value = "状态", order = 37)
+    @ColumnWidth(15)
+    private String shopStatus;
+}
--- a/coolstore-partner-model/src/main/java/com/cool/store/dto/ExportJoinShopDTO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/ExportJoinShopDTO.java
@@ -0,0 +1,167 @@
+package com.cool.store.dto;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+/**
+ * @Author: WangShuo
+ * @Date: 2025/04/28/18:41
+ * @Version 1.0
+ * @注释:
+ */
+@Data
+public class ExportJoinShopDTO {
+
+    @ExcelProperty(value = "门店编码", order = 1)
+    @ColumnWidth(20)
+    private String shopCode;
+
+    @ExcelProperty(value = "签约门店名称", order = 2)
+    @ColumnWidth(25)
+    private String shopName;
+
+    @ExcelProperty(value = "门店类型", order = 3)
+    @ColumnWidth(20)
+    private String storeType;
+
+    @ExcelProperty(value = "加盟模式", order = 4)
+    @ColumnWidth(20)
+    private String joinMode;
+
+    @ExcelProperty(value = "加盟商姓名", order = 5)
+    @ColumnWidth(20)
+    private String username;
+
+    @ExcelProperty(value = "加盟商手机号", order = 6)
+    @ColumnWidth(20)
+    private String mobile;
+
+    @ExcelProperty(value = "所属大区", order = 7)
+    @ColumnWidth(20)
+    private String regionName;
+
+    @ExcelProperty(value = "督导", order = 8)
+    @ColumnWidth(20)
+    private String investmentManagerName;
+
+    @ExcelProperty(value = "签约人1姓名", order = 9)
+    @ColumnWidth(20)
+    private String partnershipSignatoryFirst;
+
+    @ExcelProperty(value = "签约人1手机号", order = 10)
+    @ColumnWidth(20)
+    private String partnershipSignatoryFirstMobile;
+
+    @ExcelProperty(value = "签约人1身份证号码", order = 11)
+    @ColumnWidth(30)
+    private String partnershipSignatoryFirstIdCard;
+
+    @ExcelProperty(value = "签约人2姓名", order = 12)
+    @ColumnWidth(20)
+    private String partnershipSignatorySecond;
+
+    @ExcelProperty(value = "签约人2手机号", order = 13)
+    @ColumnWidth(20)
+    private String partnershipSignatorySecondMobile;
+
+    @ExcelProperty(value = "签约人2身份证号码", order = 14)
+    @ColumnWidth(30)
+    private String partnershipSignatorySecondIdCard;
+
+    @ExcelProperty(value = "合同编号", order = 15)
+    @ColumnWidth(20)
+    private String contractCode;
+
+    @ExcelProperty(value = "第一年加盟开始日期", order = 16)
+    @ColumnWidth(30)
+    private String firstYearStartTime;
+
+    @ExcelProperty(value = "第一年管理费到期日期", order = 17)
+    @ColumnWidth(30)
+    private String firstYearEndTime;
+
+    @ExcelProperty(value = "加盟费（含税）", order = 18)
+    @ColumnWidth(20)
+    private String franchiseFee;
+
+    @ExcelProperty(value = "第一年度管理费（含税）", order = 19)
+    @ColumnWidth(40)
+    private String firstYearManagementFee;
+
+    @ExcelProperty(value = "设计费（含税）", order = 20)
+    @ColumnWidth(20)
+    private String performanceBond;
+
+    @ExcelProperty(value = "保证金（含税）", order = 21)
+    @ColumnWidth(20)
+    private String loanMargin;
+
+    @ExcelProperty(value = "第一年度品牌使用费（含税）", order = 22)
+    @ColumnWidth(40)
+    private String firstYearFee;
+
+    @ExcelProperty(value = "合计缴费金额（含税）", order = 23)
+    @ColumnWidth(30)
+    private String totalAmountContributions;
+
+    @ExcelProperty(value = "加盟费优惠原因", order = 24)
+    @ColumnWidth(30)
+    private String discountReason;
+
+    @ExcelProperty(value = "店面租金", order = 25)
+    @ColumnWidth(20)
+    private String monthRent;
+
+    @ExcelProperty(value = "省", order = 26)
+    @ColumnWidth(15)
+    private String province;
+
+    @ExcelProperty(value = "市", order = 27)
+    @ColumnWidth(15)
+    private String city;
+
+    @ExcelProperty(value = "区", order = 28)
+    @ColumnWidth(15)
+    private String district;
+
+    @ExcelProperty(value = "场地实际面积", order = 29)
+    @ColumnWidth(15)
+    private String area;
+
+    @ExcelProperty(value = "报货物流仓库", order = 30)
+    @ColumnWidth(25)
+    private String declareGoodsLogisticsWarehouseName;
+
+    @ExcelProperty(value = "报货类型", order = 31)
+    @ColumnWidth(20)
+    private String declareGoodsType;
+
+    @ExcelProperty(value = "云流水报货时间", order = 32)
+    @ColumnWidth(35)
+    private String ylsDeclareGoodsTime;
+
+    @ExcelProperty(value = "仓库配送时间", order = 33)
+    @ColumnWidth(35)
+    private String warehouseDeliveryTime;
+
+    @ExcelProperty(value = "收款公司", order = 34)
+    @ColumnWidth(35)
+    private String receivingFirmName;
+
+    @ExcelProperty(value = "收款公司民生银行账号", order = 35)
+    @ColumnWidth(35)
+    private String receivingMsBankAccount;
+
+    @ExcelProperty(value = "店铺地址", order = 36)
+    @ColumnWidth(40)
+    private String shopAddress;
+
+    @ExcelProperty(value = "阶段状态-建店资料收集", order = 37)
+    @ColumnWidth(30)
+    private String buildInformationStatus;
+
+    @ExcelProperty(value = "建店资料完成时间", order = 38)
+    @ColumnWidth(30)
+    private String buildInformationEndTime;
+}
--- a/coolstore-partner-model/src/main/java/com/cool/store/dto/ExportProgressDTO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/ExportProgressDTO.java
@@ -0,0 +1,159 @@
+package com.cool.store.dto;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+/**
+ * @Author: WangShuo
+ * @Date: 2025/04/28/20:11
+ * @Version 1.0
+ * @注释:
+ */
+@Data
+public class ExportProgressDTO {
+
+    @ExcelProperty(value = "门店编码", order = 1)
+    @ColumnWidth(20)
+    private String shopCode;
+
+    @ExcelProperty(value = "签约门店名称", order = 2)
+    @ColumnWidth(25)
+    private String shopName;
+
+    @ExcelProperty(value = "点餐小程序门店名称", order = 3)
+    @ColumnWidth(30)
+    private String miniProgramsShopName;
+
+    @ExcelProperty(value = "门店类型", order = 4)
+    @ColumnWidth(20)
+    private String storeType;
+
+    @ExcelProperty(value = "所属品牌", order = 5)
+    @ColumnWidth(20)
+    private String franchiseBrand;
+
+    @ExcelProperty(value = "加盟模式", order = 6)
+    @ColumnWidth(20)
+    private String joinMode;
+
+    @ExcelProperty(value = "加盟商姓名", order = 7)
+    @ColumnWidth(20)
+    private String username;
+
+    @ExcelProperty(value = "加盟商手机号", order = 8)
+    @ColumnWidth(20)
+    private String mobile;
+
+    @ExcelProperty(value = "所属大区", order = 9)
+    @ColumnWidth(20)
+    private String regionName;
+
+    @ExcelProperty(value = "督导", order = 10)
+    @ColumnWidth(20)
+    private String investmentManagerName;
+
+    @ExcelProperty(value = "火码POS账号状态", order = 11)
+    @ColumnWidth(25)
+    private String posStatus;
+
+    @ExcelProperty(value = "云流水账号状态", order = 12)
+    @ColumnWidth(25)
+    private String ylsStatus;
+
+    @ExcelProperty(value = "营帐通开通状态", order = 13)
+    @ColumnWidth(25)
+    private String yztStatus;
+
+    @ExcelProperty(value = "信发系统开通状态", order = 14)
+    @ColumnWidth(25)
+    private String xfStatus;
+
+    @ExcelProperty(value = "新掌柜账号状态", order = 15)
+    @ColumnWidth(25)
+    private String xzgStatus;
+
+    @ExcelProperty(value = "美团团购账号状态", order = 16)
+    @ColumnWidth(25)
+    private String mtgStatus;
+
+    @ExcelProperty(value = "抖音团购账号", order = 17)
+    @ColumnWidth(25)
+    private String dygStatus;
+
+    @ExcelProperty(value = "快手团购账号状态", order = 18)
+    @ColumnWidth(25)
+    private String ksgStatus;
+
+    @ExcelProperty(value = "饿了么外卖账号状态", order = 19)
+    @ColumnWidth(25)
+    private String elmStatus;
+
+    @ExcelProperty(value = "美团外卖账号状态", order = 20)
+    @ColumnWidth(25)
+    private String mtwStatus;
+
+    @ExcelProperty(value = "京东外卖账号状态", order = 21)
+    @ColumnWidth(25)
+    private String jdwStatus;
+
+    @ExcelProperty(value = "选址", order = 22)
+    @ColumnWidth(20)
+    private String addressStatus;
+
+    @ExcelProperty(value = "租赁合同", order = 23)
+    @ColumnWidth(20)
+    private String leaseStatus;
+
+    @ExcelProperty(value = "缴纳加盟费/保证金", order = 24)
+    @ColumnWidth(25)
+    private String joinFeeStatus;
+
+    @ExcelProperty(value = "加盟合同签约", order = 25)
+    @ColumnWidth(20)
+    private String joinContractStatus;
+
+    @ExcelProperty(value = "营业执照", order = 26)
+    @ColumnWidth(20)
+    private String businessLicenseStatus;
+
+    @ExcelProperty(value = "食品经营许可证", order = 27)
+    @ColumnWidth(20)
+    private String foodLicenseStatus;
+
+    @ExcelProperty(value = "建店资料收集", order = 28)
+    @ColumnWidth(20)
+    private String buildStatus;
+
+    @ExcelProperty(value = "建店资料完成时间", order = 29)
+    @ColumnWidth(25)
+    private String buildEndTime;
+
+    @ExcelProperty(value = "设计阶段", order = 30)
+    @ColumnWidth(20)
+    private String designStatus;
+
+    @ExcelProperty(value = "施工阶段", order = 31)
+    @ColumnWidth(20)
+    private String constructionStatus;
+
+    @ExcelProperty(value = "装修验收", order = 32)
+    @ColumnWidth(20)
+    private String decorationStatus;
+
+    @ExcelProperty(value = "培训登记", order = 33)
+    @ColumnWidth(15)
+    private String trainStatus;
+
+    @ExcelProperty(value = "开业运营方案", order = 34)
+    @ColumnWidth(20)
+    private String openPlanStatus;
+
+    @ExcelProperty(value = "当前进度", order = 35)
+    @ColumnWidth(30)
+    private String currentProgress;
+
+    @ExcelProperty(value = "状态", order = 36)
+    @ColumnWidth(20)
+    private String shopStatus;
+}
--- a/coolstore-partner-model/src/main/java/com/cool/store/dto/FranchiseFeeDTO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/FranchiseFeeDTO.java
@@ -32,7 +32,7 @@ public class FranchiseFeeDTO {
    private String  firstYearManagementFee;
    //第一年度品牌使用费
    private String  firstYearFee;
-    //履约保证金
+    //设计费
    private String performanceBond;
    //组合字段
    private String combinedField;
--- a/coolstore-partner-model/src/main/java/com/cool/store/dto/PointInfoDTO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/PointInfoDTO.java
@@ -0,0 +1,24 @@
+package com.cool.store.dto;
+
+import lombok.Data;
+
+/**
+ * @Author: WangShuo
+ * @Date: 2025/04/28/19:35
+ * @Version 1.0
+ * @注释:
+ */
+@Data
+public class PointInfoDTO {
+    private Long pointId;
+
+    private String province;
+
+    private String city;
+
+    private String pointArea;
+
+    private String district;
+
+    private String monthRent;
+}
--- a/coolstore-partner-model/src/main/java/com/cool/store/response/BranchShopResponse.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/response/BranchShopResponse.java
@@ -19,6 +19,9 @@ import java.util.List;
 public class BranchShopResponse {
    private Long shopId;
    private Long lineId;
+    private Long pointId;
+    @ApiModelProperty("门店类型")
+    private Integer storeType;
    @ApiModelProperty("加盟商姓名")
    private String username;
    @ApiModelProperty("加盟商手机号")
--- a/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseFeeResponse.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseFeeResponse.java
@@ -39,7 +39,7 @@ public class FranchiseFeeResponse {
    private Date thirdYearEndTime;
    @ApiModelProperty("第仨年度加盟费")
    private String thirdYearFee;
-    @ApiModelProperty("履约保证金")
+    @ApiModelProperty("设计费")
    private String performanceBond;
    private Date createTime;
    private Date updateTime;