Merge branch 'cc_20250509_import_data' into 'master'

Cc 20250509 import data

See merge request hangzhou/java/custom_zxjp!74

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

@@ -0,0 +1,19 @@
+package com.cool.store.dto;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author: WangShuo
+ * @Date: 2025/05/12/14:03
+ * @Version 1.0
+ * @注释:
+ */
+@Data
+public class BuildStageDTO {
+
+    private Long shopId;
+
+    private String endTime;
+}

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

@@ -0,0 +1,79 @@
+package com.cool.store.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author: WangShuo
+ * @Date: 2025/05/09/10:22
+ * @Version 1.0
+ * @注释:
+ */
+@Data
+public class ImportOaOldShopDataDTO {
+    @ApiModelProperty("门店编码")
+    private String shopCode;
+
+    @ApiModelProperty("签约门店名称")
+    private String shopName;
+
+    @ApiModelProperty("省")
+    private String province;
+
+    @ApiModelProperty("市")
+    private String city;
+
+    @ApiModelProperty("区")
+    private String district;
+
+    @ApiModelProperty("门店地址")
+    private String shopAddress;
+
+    @ApiModelProperty("建店资料完成时间")
+    private String buildEndTime;
+
+    @ApiModelProperty("店面租金")
+    private String monthRent;
+    @ApiModelProperty("场地实际面积")
+    private String pointArea;
+
+    @ApiModelProperty("签约人2姓名")
+    private String partnershipSignatorySecond;
+    @ApiModelProperty("签约人2手机号")
+    private String partnershipSignatorySecondMobile;
+    @ApiModelProperty("签约人2身份证号")
+    private String partnershipSignatorySecondIdNumber;
+    @ApiModelProperty("合同开始日期")
+    private String contractStartDate;
+    @ApiModelProperty("合同结束日期")
+    private String contractEndDate;
+    @ApiModelProperty("合同编号")
+    private String contractCode;
+    @ApiModelProperty("保护距离(米)")
+    private String protectionDistance;
+    @ApiModelProperty("介绍人")
+    private String introducer;
+    @ApiModelProperty("介绍门店")
+    private String introduceStore;
+    @ApiModelProperty("介绍奖")
+    private String introductionAward;
+    @ApiModelProperty("报货物流仓库")
+    private String declareGoodsLogisticsWarehouseName;
+    @ApiModelProperty("收款公司民生银行账号")
+    private String receivingMsBankAccount;
+    @ApiModelProperty("云流水账号")
+    private String ylsAccount;
+    @ApiModelProperty("加盟费")
+    private String yearFranchiseFee;
+    @ApiModelProperty("管理费")
+    private String firstYearManageFee;
+    @ApiModelProperty("设计费")
+    private String performanceBond;
+    @ApiModelProperty("保证金")
+    private String loanMargin;
+    @ApiModelProperty("品牌使用管理费")
+    private String firstYearFee;
+    @ApiModelProperty("加盟费优惠原因")
+    private String discountReason;
+
+}

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

@@ -0,0 +1,22 @@
+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/05/09/10:43
+ * @Version 1.0
+ * @注释:
+ */
+@Data
+public class ImportOaOldShopDataErrorDTO {
+
+    @ExcelProperty(value = "门店编码", order = 1)
+    @ColumnWidth(30)
+    private String shopCode;
+    @ExcelProperty(value = "错误原因", order = 2)
+    @ColumnWidth(40)
+    private String errorReason;
+}

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

@@ -90,8 +90,7 @@ public class AddSignFranchiseRequest {
     @ApiModelProperty("合同金额")
     @NotBlank(message = "合同金额不能为空")
     private String contractAmount;
-    @ApiModelProperty("合伙签约人1")
-    @NotBlank(message = "合伙签约人1不能为空")
+    @ApiModelProperty("合伙签约人1//废弃")
     private String partnershipSignatoryFirst;
     @ApiModelProperty("合伙签约人2")
     private String partnershipSignatorySecond;