Merge #118 into master from cc_20260506_newsign

feat:addShopDecorationLog

* cc_20260506_newsign: (14 commits squashed)

  - feat：新签调整

  - feat：招商

  - feat：招商

  - feat：招商

  - feat：招商

  - feat：id

  - feat:招商副总裁审核

  - feat:招商经理

  - feat:招商经理

  - feat:招商大区总审核 或者 分部内勤审核 其他状态不能审核

  - feat:SHOP_SUB_STAGE_STATUS_150_5

  - feat:建店代办处理

  - feat:addShopDecorationLog

  - feat:addShopDecorationLog

Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/118

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

@@ -0,0 +1,60 @@
+package com.cool.store.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+import java.util.Date;
+
+/**
+ * 门店装修修改记录表
+ */
+@Table(name = "zxjp_shop_decoration_log")
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ShopDecorationLogDO {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    /**
+     * 门店ID
+     */
+    @Column(name = "shop_id")
+    @ApiModelProperty("门店ID")
+    private Long shopId;
+
+    /**
+     * 修改前数据(JSON格式)
+     */
+    @Column(name = "old_data", columnDefinition = "json")
+    @ApiModelProperty("修改前数据")
+    private String oldData;
+
+    /**
+     * 修改后数据(JSON格式)
+     */
+    @Column(name = "new_data", columnDefinition = "json")
+    @ApiModelProperty("修改后数据")
+    private String newData;
+
+    /**
+     * 修改人
+     */
+    @Column(name = "operator")
+    @ApiModelProperty("修改人")
+    private String operator;
+
+    /**
+     * 修改时间
+     */
+    @Column(name = "operator_time")
+    @ApiModelProperty("修改时间")
+    private Date operatorTime;
+}

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

@@ -184,4 +184,10 @@ public class SignFranchiseDO {
     @Column(name = "contract_service_life")
     private Integer contractServiceLife;
 
+    /**
+     * 展示柜数量
+     */
+    @Column(name = "display_cabinets_num")
+    private Integer displayCabinetsNum;
+
 }

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

@@ -249,6 +249,9 @@ public class AddSignFranchiseRequest {
     @ApiModelProperty("特殊情况说明")
     private String specialInstruction;
 
+    @ApiModelProperty("展示柜数量")
+    private Integer displayCabinetsNum;
+
     private Date firstYearStartTime;
 
     private Date firstYearEndTime;
@@ -299,6 +302,7 @@ public class AddSignFranchiseRequest {
         signFranchiseDO.setDiscountAmount(this.discountAmount);
         signFranchiseDO.setCurrency(this.currency);
         signFranchiseDO.setContractServiceLife(this.contractServiceLife);
+        signFranchiseDO.setDisplayCabinetsNum(this.displayCabinetsNum);
         return signFranchiseDO;
     }
 

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

@@ -0,0 +1,32 @@
+package com.cool.store.request;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+/**
+ * 门店装修修改记录 Request
+ */
+@Data
+@ApiModel
+public class ShopDecorationLogRequest {
+
+    @ApiModelProperty("门店ID")
+    @NotNull(message = "门店ID不能为空")
+    private Long shopId;
+
+    @ApiModelProperty("装修等级")
+    private String decorationLevel;
+
+    @ApiModelProperty("装修设计要求")
+    private String decorationRequirement;
+
+    @ApiModelProperty("装修属性 0-新开店 1-老店新开 2-老店翻新 3-迁址")
+    private Integer shopDecorationAttributes;
+
+    @ApiModelProperty("特殊说明")
+    private String specialInstruction;
+}

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

@@ -44,6 +44,8 @@ public class StoreMasterDTO {
     private String bloc;
     @ApiModelProperty("所属大区")
     private Long branch;
+    @ApiModelProperty("所属招商大区")
+    private Long investRegionId;
     @ApiModelProperty("加盟督导-人")
     private String joinSupervision;
     @ApiModelProperty("管理督导-组织")

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

@@ -357,4 +357,7 @@ public class AddSignFranchiseResponse {
 
     @ApiModelProperty("特殊情况说明")
     private String specialInstruction;
+
+    @ApiModelProperty("展示柜数量")
+    private Integer displayCabinetsNum;
 }

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

@@ -0,0 +1,32 @@
+package com.cool.store.response;
+
+import com.cool.store.request.ShopDecorationLogRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 门店装修修改记录 Response
+ */
+@Data
+@ApiModel
+public class ShopDecorationLogResponse {
+
+    @ApiModelProperty("主键ID")
+    private Long id;
+
+    @ApiModelProperty("门店ID")
+    private Long shopId;
+
+    @ApiModelProperty("修改前数据")
+    private ShopDecorationLogRequest oldData;
+
+    @ApiModelProperty("修改后数据")
+    private ShopDecorationLogRequest newData;
+
+    @ApiModelProperty("修改人")
+    private String operator;
+
+    @ApiModelProperty("修改时间")
+    private String operatorTime;
+}