加盟合同优化

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

@@ -129,5 +129,6 @@ public class ShopInfoDO {
     @Column(name = "shop_status")
     private Integer shopStatus;
 
-
+    @Column(name = "store_type")
+    private Integer storeType;
 }

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

@@ -21,17 +21,20 @@ public class AddSignFranchiseRequest {
 
     private Long regionId;
 
+    @NotBlank(message = "加盟签约店铺名称不能为空")
     private String shopName;
 
+    @NotBlank(message = "门店地址不能为空")
     private String detailAddress;
 
-
     @ApiModelProperty("加盟品牌")
     @NotBlank(message = "加盟品牌不能为空")
     private String franchiseBrand;
 
+    @ApiModelProperty("【门店类型】：0-无展示门店、1-餐厅店、2-普通门店'")
+    private Integer storeType;
+
     @ApiModelProperty("经营模式（0 无 1直营 2加盟）")
-    @NotNull(message = "经营模式不能为空")
     private Integer businessModel;
 
     @ApiModelProperty("加盟模式（1-加盟部加盟店、2-加盟公司、3-自有加盟、4-强加盟）")
@@ -41,7 +44,7 @@ public class AddSignFranchiseRequest {
     /**
      * SignTypeEnum
      */
-    @ApiModelProperty("签约类型,0.转让　1.新签　2.续签　3.迁址　5.新签同异业转化")
+    @ApiModelProperty("签约类型,0.转让　1.新签　2.续签　3.迁址　5.新签同异业转化，6-老店新开 7-直营转加盟")
     private Integer signType;
 
     @ApiModelProperty("品牌使用费比例")
@@ -80,8 +83,10 @@ public class AddSignFranchiseRequest {
     private String mobile;
 
     @ApiModelProperty("合同编码")
+    @NotBlank(message = "合同编码不能为空")
     private String contractCode;
     @ApiModelProperty("合同金额")
+    @NotBlank(message = "合同金额不能为空")
     private String contractAmount;
     @ApiModelProperty("合伙签约人1")
     @NotBlank(message = "合伙签约人1不能为空")

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

@@ -34,4 +34,8 @@ public class BranchShopDetailRequest {
     private String shopCode;
     @ApiModelProperty("门店名称")
     private String shopName;
+    @ApiModelProperty("店铺类型：0-无展示门店、1-餐厅店、2-普通门店")
+    @NotNull
+    private Integer storeType;
+
 }

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

@@ -25,6 +25,9 @@ public class AddSignFranchiseResponse {
     /**
      * SignTypeEnum
      */
+    @ApiModelProperty("【门店类型】：0-无展示门店、1-餐厅店、2-普通门店'")
+    private Integer storeType;
+
     @ApiModelProperty("签约类型,0.转让　1.新签　2.续签　3.迁址　5.新签同异业转化")
     private Integer signType;
 

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

@@ -69,4 +69,7 @@ public class BranchShopDetailResponse {
     @ApiModelProperty("铺位id")
     private Long pointId;
 
+    @ApiModelProperty("店铺类型：0-无展示门店、1-餐厅店、2-普通门店")
+    private Integer storeType;
+
 }