diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
index 6d1ef074a..e13ddeec0 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
@@ -28,6 +28,7 @@
+
@@ -35,7 +36,7 @@
, region_id, line_id, partner_id, point_id, shop_name,
shop_code, store_num, shop_manager_user_id, supervisor_user_id,
plan_open_time, cur_progress, shop_type, shop_stage, deleted, create_time, update_time,
- join_mode,detail_address,franchise_brand,development_manager,want_shop_area_id,investment_manager,shop_status,create_user_id,update_user_id
+ join_mode,detail_address,franchise_brand,development_manager,want_shop_area_id,investment_manager,shop_status,create_user_id,update_user_id,store_type
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/ShopInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/ShopInfoDO.java
index 5e05578f5..02a428d49 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/entity/ShopInfoDO.java
+++ b/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;
}
\ No newline at end of file
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java
index 1f9f3ed56..c94d46c72 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java
+++ b/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不能为空")
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/BranchShopDetailRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/BranchShopDetailRequest.java
index e975cfedd..624850d68 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/request/BranchShopDetailRequest.java
+++ b/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;
+
}
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java
index 107d28894..4438e18e3 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java
+++ b/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;
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/BranchShopDetailResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/BranchShopDetailResponse.java
index c045a4b10..06d6362d4 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/response/BranchShopDetailResponse.java
+++ b/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;
+
}
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
index 32203e4c6..1be8f7752 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
@@ -380,6 +380,7 @@ public class ShopServiceImpl implements ShopService {
response.setShopName(shopInfo.getShopName());
response.setJoinMode(shopInfo.getJoinMode());
response.setShopCode(shopInfo.getShopCode());
+ response.setStoreType(shopInfo.getStoreType());
response.setShopStatus(shopInfo.getShopStatus());
response.setFranchiseBrand(shopInfo.getFranchiseBrand());
if (CollectionUtils.isNotEmpty(shopContractActualCompletionTime)) {
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java
index 1247cbcd1..2101317c5 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java
@@ -212,6 +212,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
shopInfoDO.setJoinMode(request.getJoinMode());
shopInfoDO.setFranchiseBrand(request.getFranchiseBrand());
shopInfoDO.setUpdateTime(new Date());
+ shopInfoDO.setStoreType(request.getStoreType());
shopInfoMapper.updateByPrimaryKeySelective(shopInfoDO);
OrderSysInfoDO orderSysInfoDO = orderSysInfoDAO.selectByShopId(request.getShopId());
if (Objects.isNull(orderSysInfoDO)){
@@ -282,6 +283,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
addSignFranchiseResponse.setDetailAddress(shopInfoDO.getDetailAddress());
+ addSignFranchiseResponse.setStoreType(shopInfoDO.getStoreType());
if (Objects.nonNull(signFranchiseDO)) {
addSignFranchiseResponse.setId(signFranchiseDO.getId());
addSignFranchiseResponse.setShopId(signFranchiseDO.getShopId());