suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

加盟合同优化

Browse Source
This commit is contained in:
shuo.wang
2025-04-22 11:45:12 +08:00
parent d39ee0f628
commit 574e0662e1
8 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
View File

@@ -28,6 +28,7 @@
<result column="shop_status" jdbcType="TINYINT" property="shopStatus"/>
<result column="create_user_id" jdbcType="VARCHAR" property="createUserId"/>
<result column="update_user_id" jdbcType="VARCHAR" property="updateUserId"/>
<result column="store_type" jdbcType="TINYINT" property="storeType"/>
</resultMap>
<sql id="allColumn">
@@ -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
</sql>
<insert id="batchAddShop" useGeneratedKeys="true" keyProperty="id" keyColumn="id">

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

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

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

@@ -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不能为空")

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

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

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

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

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

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

1
coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
View File

@@ -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)) {

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java
View File

@@ -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());