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-07-11 13:20:50 +08:00
parent 5f7271b38e
commit 3d003afc9c
20 changed files with 135 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-model/src/main/java/com/cool/store/dto/Preparation/PreparationDTO.java
View File

@@ -53,5 +53,7 @@ public class PreparationDTO {
private Long pointId;
private Long managerRegionId;
}

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

@@ -149,6 +149,7 @@ public class ShopInfoDO {
//区code
@Column(name = "district_code")
private Integer districtCode;
@Column(name = "manager_supervisor")
private String managerSupervisor;
//所属管理区域
@Column(name = "manager_region_id")
private Long managerRegionId;
}

5
coolstore-partner-model/src/main/java/com/cool/store/request/AddBranchShopRequest.java
View File

@@ -44,6 +44,10 @@ public class AddBranchShopRequest {
@ApiModelProperty("所属大区")
private Long regionId;
@NotNull
@ApiModelProperty("所属管理区域id")
private Long managerRegionId;
public ShopInfoDO toDO(AddBranchShopRequest request, LineInfoDO lineInfo) {
ShopInfoDO shopInfoDO = new ShopInfoDO();
shopInfoDO.setLineId(request.getLineId());
@@ -60,6 +64,7 @@ public class AddBranchShopRequest {
shopInfoDO.setShopStage(ShopStageEnum.SHOP_STAGE_1.getShopStage());
shopInfoDO.setPartnerId(lineInfo.getPartnerId());
shopInfoDO.setFranchiseBrand(request.getFranchiseBrand());
shopInfoDO.setManagerRegionId(request.getManagerRegionId());
return shopInfoDO;
}
}

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

@@ -141,6 +141,11 @@ public class AddSignFranchiseRequest {
@ApiModelProperty("区code")
private Integer districtCode;
@NotNull(message = "所属管理区域id不能为空")
@ApiModelProperty("所属管理区域id")
private Long managerRegionId;
public SignFranchiseDO toSignFranchiseDO() {
SignFranchiseDO signFranchiseDO = new SignFranchiseDO();

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

@@ -36,5 +36,7 @@ public class BranchShopDetailRequest {
@ApiModelProperty("店铺类型：0-无展示门店、1-餐厅店、2-普通门店")
@NotNull(message = "门店类型不能为空")
private Integer storeType;
@ApiModelProperty("所属管理区域id")
private Long managerRegionId;
}

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

@@ -229,5 +229,10 @@ public class AddSignFranchiseResponse {
@ApiModelProperty("区code")
private Integer districtCode;
@ApiModelProperty("所属管理区域id")
private Long managerRegionId;
@ApiModelProperty("所属管理区域name")
private String managerRegionName;
}

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

@@ -73,4 +73,11 @@ public class BranchShopDetailResponse {
@ApiModelProperty("店铺类型：0-无展示门店、1-餐厅店、2-普通门店")
private Integer storeType;
@ApiModelProperty("所属管理区域id")
private Long managerRegionId;
@ApiModelProperty("所属管理区域name")
private String managerRegionName;
}

6
coolstore-partner-model/src/main/java/com/cool/store/response/BranchShopResponse.java
View File

@@ -55,6 +55,12 @@ public class BranchShopResponse {
private Date createTime;
@ApiModelProperty("开业活动完成时间")
private Date openingActivityEndTime;
@ApiModelProperty("所属管理区域id")
private Long managerRegionId;
@ApiModelProperty("所属管理区域name")
private String managerRegionName;
public void setDays() {
if (this.openingActivityEndTime==null){

18
coolstore-partner-model/src/main/java/com/cool/store/response/RegionResponse.java Normal file
View File

@@ -0,0 +1,18 @@
package com.cool.store.response;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author: WangShuo
* @Date: 2025/07/11/11:25
* @Version 1.0
* @注释:
*/
@Data
public class RegionResponse {
@ApiModelProperty("区域id")
private String regionId;
@ApiModelProperty("区域名称")
private String name;
}

9
coolstore-partner-model/src/main/java/com/cool/store/vo/shop/MiniShopPageVO.java
View File

@@ -62,6 +62,13 @@ public class MiniShopPageVO {
private String wantRegionName;
@ApiModelProperty("门店状态'0.跟进中 1.已完成 2.已放弃',")
private Integer shopStatus;
@ApiModelProperty("所属管理区域id")
private Long managerRegionId;
@ApiModelProperty("所属管理区域name")
private String managerRegionName;
public MiniShopPageVO(Long shopId, String shopName, String shopCode, Boolean flag, Long pointId, Long regionId, String regionName) {
this.shopId = shopId;
this.shopName = shopName;
@@ -101,6 +108,8 @@ public class MiniShopPageVO {
miniShopPageVO.setWantRegionName(wantRegionMap.get(shopInfo.getWantShopAreaId()));
}
miniShopPageVO.setShopStatus(shopInfo.getShopStatus());
miniShopPageVO.setManagerRegionId(shopInfo.getManagerRegionId());
miniShopPageVO.setManagerRegionName(regionNameMap.getOrDefault(shopInfo.getManagerRegionId(), ""));
resultList.add(miniShopPageVO);
}