Merge #34 into master from cc_20260116_new_field

fix:加盟合同新增字段推送红圈通

* cc_20260116_new_field: (5 commits squashed)

  - fix:加盟合同新增字段

  - fix:加盟合同新增字段

  - Merge branch 'refs/heads/master' into cc_20260116_new_field
    
    # Conflicts:
    #	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
    #	coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java

  - fix:加盟合同新增字段推送红圈通

  - Merge branch 'master' into cc_20260116_new_field
    
    # Conflicts:
    #	coolstore-partner-model/src/main/java/com/cool/store/entity/ShopInfoDO.java

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

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

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

@@ -173,4 +173,34 @@ public class ShopInfoDO {
 
     @Column(name = "actual_open_date")
     private Date actualOpenDate;
+
+    /**
+     * 鸡排价格
+     */
+    @Column(name = "chicken_amount")
+    private BigDecimal chickenAmount;
+
+    /**
+     * 其他价格原因说明
+     */
+    @Column(name = "chicken_instruction")
+    private String chickenInstruction;
+
+    /**
+     * 装修等级
+     */
+    @Column(name = "decoration_level")
+    private String decorationLevel;
+
+    /**
+     * 装修设计要求
+     */
+    @Column(name = "decoration_requirement")
+    private String decorationRequirement;
+
+    /**
+     * 特殊情况说明
+     */
+    @Column(name = "special_instruction")
+    private String specialInstruction;
 }

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

@@ -9,6 +9,7 @@ import lombok.Data;
 import javax.persistence.Column;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
@@ -233,7 +234,20 @@ public class AddSignFranchiseRequest {
     @ApiModelProperty("合同使用年限")
     private Integer contractServiceLife;
 
+    @ApiModelProperty("鸡排价格")
+    private BigDecimal chickenAmount;
 
+    @ApiModelProperty("其他价格原因说明")
+    private String chickenInstruction;
+
+    @ApiModelProperty("装修等级，字典表decoration_level")
+    private String decorationLevel;
+
+    @ApiModelProperty("装修设计要求，字典表decoration_requirement")
+    private String decorationRequirement;
+
+    @ApiModelProperty("特殊情况说明")
+    private String specialInstruction;
 
 
     public SignFranchiseDO toSignFranchiseDO() {

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

@@ -38,6 +38,14 @@ public class HqtBuildRequest {
     private Integer isPayDesignFee;
     //加盟品牌
     private Integer franchiseBrand;
+    // 装修等级
+    private String decorationLevel;
+    // 装修设计要求
+    private String decorationRequirement;
+    // 特殊情况说明
+    private String specialInstruction;
+    // 门店类型
+    private Integer storeType;
 
     //招商所属区域
     private String investRegionName;

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

@@ -2,6 +2,7 @@ package com.cool.store.request.hqt;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @Data
 public class HqtBuildAPIRequest {
@@ -114,6 +115,30 @@ public class HqtBuildAPIRequest {
     @JsonProperty("负责人邮箱")
     private String field191__c;
 
+    /**
+     * 特殊情况说明
+     */
+    @JsonProperty("field195__c")
+    private String field195__c;
+
+    /**
+     * 装修设计要求
+     */
+    @JsonProperty("field194__c")
+    private Field8__c field194__c;
+
+    /**
+     * 装修等级
+     */
+    @JsonProperty("field193__c")
+    private Field8__c field193__c;
+
+    /**
+     * 门店类型
+     */
+    @JsonProperty("field192__c")
+    private Field8__c field192__c;
+
     @Data
     public static class Field124__c {
         /**
@@ -220,6 +245,7 @@ public class HqtBuildAPIRequest {
     }
 
     @Data
+    @NoArgsConstructor
     public static class Field8__c {
         @JsonProperty("defaultItem")
         /**
@@ -246,6 +272,12 @@ public class HqtBuildAPIRequest {
          */
         @JsonProperty("name")
         private String name;
+
+        public Field8__c(String code, String label) {
+            this.id = code;
+            this.name = code;
+            this.label = label;
+        }
     }
 }
 

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

@@ -1,5 +1,6 @@
 package com.cool.store.response;
 
+import com.cool.store.annotation.DictField;
 import com.cool.store.dto.PartnerBankInfoDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,6 +9,7 @@ import lombok.Data;
 import javax.persistence.Column;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -332,4 +334,27 @@ public class AddSignFranchiseResponse {
 
     @Column(name = "contract_service_life")
     private Integer contractServiceLife;
+
+    @ApiModelProperty("鸡排价格")
+    private BigDecimal chickenAmount;
+
+    @ApiModelProperty("其他价格原因说明")
+    private String chickenInstruction;
+
+    @ApiModelProperty("装修等级")
+    private String decorationLevel;
+
+    @ApiModelProperty("装修等级名称")
+    @DictField
+    private String decorationLevelName;
+
+    @ApiModelProperty("装修设计要求")
+    private String decorationRequirement;
+
+    @ApiModelProperty("装修设计要求名称")
+    @DictField
+    private String decorationRequirementName;
+
+    @ApiModelProperty("特殊情况说明")
+    private String specialInstruction;
 }