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

Merge #19 into master from cc_20251223_orgChange

Browse Source 
组织架构迁移

* cc_20251223_orgChange: (32 commits squashed)

  - fix:角色枚举值变更

  - fix:待办-缴纳加盟费/保证金中，删除企微督导查询权限，督导查询权限改为招商经理；待办-建店资料中，删除企微督导查询权限

  - fix:开店管理-查询我负责的招商经理或运营顾问为当前用户的；查询我管辖的如果当前用户是招商经理则查招商区域

  - feat:组织架构切换调整

  - Merge remote-tracking branch 'origin/cc_20251223_orgChange' into cc_20251223_orgChange

  - feat:门店详情新增招商所属大区 运营顾问

  - fix:获取可选择的大区新增type字段

  - Merge remote-tracking branch 'origin/cc_20251223_orgChange' into cc_20251223_orgChange

  - feat:修改招商所属大区

  - Merge remote-tracking branch 'origin/cc_20251223_orgChange' into cc_20251223_orgChange

  - feat:新增分店 修改分店

  - feat:operations_consultant

  - fix:获取平台建店左侧小窗详情接口新增招商区域名称字段

  - feat:合同开始之后需要分配才能触发后续阶段

  - Merge remote-tracking branch 'origin/cc_20251223_orgChange' into cc_20251223_orgChange

  - fix:新增招商区域名称字段

  - Merge remote-tracking branch 'origin/cc_20251223_orgChange' into cc_20251223_orgChange

  - fix:大区查询添加enableFlag字段

  - Merge remote-tracking branch 'origin/cc_20251223_orgChange' into cc_20251223_orgChange

  - fix:代办查询bug修改

  - fix:字段缺失补充

  - Merge branch 'master' into cc_20251223_orgChange
    
    # Conflicts:
    #	coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java
    #	coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
    #	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DeskController.java

  - fix:修改基本资料bug

  - fix:线索列表接口新增招商所属区域名称字段

  - fix:加盟商资质审核通过自动建店时带出招商所属区域

  - fix:补充提交

  - fix:修改开店详情接口修改招商所属区域

  - fix:工作台待办返回招商区域名称字段

  - fix:开店详情接口招商所属区域id为0的数据返回null

  - fix:字段补充

  - fix:招商所属大区字段补充

  - fix:字段补充

Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Reviewed-by: 苏竹红 <570057076@qq.com>
Merged-by: 苏竹红 <570057076@qq.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/19
This commit is contained in:
王非凡
2025-12-31 06:56:47 +00:00
committed by 苏竹红
parent 4b7a35c96c
commit e34aea7a40
52 changed files with 669 additions and 69 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

@@ -57,5 +57,5 @@ public class PreparationDTO {
private String storeId;
private Long investRegionId;
}

3
coolstore-partner-model/src/main/java/com/cool/store/dto/region/BigRegionDTO.java
View File

@@ -15,5 +15,8 @@ public class BigRegionDTO {
private String regionName;
private String groupName;
private Long storeManageRegionId;
private Integer enableFlag;
}

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

@@ -21,6 +21,9 @@ public class LineInfoDO {
@Column(name = "region_id")
private Long regionId;
@Column(name = "invest_region_id")
private Long investRegionId;
@Column(name = "big_region_id")
private Long bigRegionId;

45
coolstore-partner-model/src/main/java/com/cool/store/entity/OperationsConsultantAssignDO.java Normal file
View File

@@ -0,0 +1,45 @@
package com.cool.store.entity;
import lombok.Data;
import java.util.Date;
import javax.persistence.*;
@Table(name = "zxjp_operations_consultant_assign")
@Data
public class OperationsConsultantAssignDO {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
/**
* 门店ID
*/
@Column(name = "shop_id")
private Long shopId;
/**
* 区域ID
*/
@Column(name = "region_id")
private Long regionId;
/**
* 分配状态（0-待分配，1-已分配）
*/
@Column(name = "assign_status")
private Integer assignStatus;
/**
* 创建时间
*/
@Column(name = "created_time")
private Date createdTime;
/**
* 更新时间
*/
@Column(name = "updated_time")
private Date updatedTime;
}

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

@@ -161,4 +161,10 @@ public class ShopInfoDO {
// 门店id
@Column(name = "store_id")
private String storeId;
@Column(name = "invest_region_id")
private Long investRegionId;
@Column(name = "operations_consultant")
private String operationsConsultant;
}

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

@@ -48,6 +48,9 @@ public class AddBranchShopRequest {
@ApiModelProperty("所属管理区域id")
private Long managerRegionId;
@ApiModelProperty("招商所属区域 20251224新增")
private Long investRegionId;
public ShopInfoDO toDO(AddBranchShopRequest request, LineInfoDO lineInfo) {
ShopInfoDO shopInfoDO = new ShopInfoDO();
shopInfoDO.setLineId(request.getLineId());
@@ -65,6 +68,7 @@ public class AddBranchShopRequest {
shopInfoDO.setPartnerId(lineInfo.getPartnerId());
shopInfoDO.setFranchiseBrand(request.getFranchiseBrand());
shopInfoDO.setManagerRegionId(request.getManagerRegionId());
shopInfoDO.setInvestRegionId(request.getInvestRegionId());
return shopInfoDO;
}
}

6
coolstore-partner-model/src/main/java/com/cool/store/request/AddLineRequest.java
View File

@@ -1,5 +1,6 @@
package com.cool.store.request;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.Max;
@@ -26,7 +27,12 @@ public class AddLineRequest {
//'1-社会加盟模式/加盟部加盟店 2-强加盟模式/加盟公司加盟店 3-加盟公司自有店',
private Integer joinMode;
@ApiModelProperty("招商经理")
private String investmentManagerUserId;
@ApiModelProperty("运营所属大区")
private Long regionId;
@ApiModelProperty("招商所属大区-1224新增")
private Long investRegionId;
}

25
coolstore-partner-model/src/main/java/com/cool/store/request/AssignOperationConsultantRequest.java Normal file
View File

@@ -0,0 +1,25 @@
package com.cool.store.request;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
/**
* @Auther zx_szh
* @Date 2025/12/25 17:58
* @Version 1.0
*/
@Data
public class AssignOperationConsultantRequest {
@ApiModelProperty("ID")
@NotNull(message = "门店ID不能为空")
private Long shopId;
@ApiModelProperty("运营顾问")
@NotBlank(message = "运营顾问不能为空")
private String operationConsultantUserId;
}

19
coolstore-partner-model/src/main/java/com/cool/store/request/AssignPendingRequest.java Normal file
View File

@@ -0,0 +1,19 @@
package com.cool.store.request;
import com.cool.store.common.PageBasicInfo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Auther zx_szh
* @Date 2025/12/25 15:17
* @Version 1.0
*/
@Data
public class AssignPendingRequest extends PageBasicInfo {
@ApiModelProperty("关键字")
private String keyword;
}

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

@@ -38,5 +38,7 @@ public class BranchShopDetailRequest {
private Integer storeType;
@ApiModelProperty("所属管理区域id")
private Long managerRegionId;
@ApiModelProperty("招商所属大区 20251224-新增")
private Long investRegionId;
}

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

@@ -4,7 +4,6 @@ import com.cool.store.common.PageBasicInfo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Date;
import java.util.List;
@@ -49,4 +48,7 @@ public class BranchShopRequest extends PageBasicInfo{
private Date contractStartTime;
@ApiModelProperty("合同结束时间")
private Date contractEndTime;
@ApiModelProperty(value = "招商区域", hidden = true)
private List<String> authInvestRegionIds;
}

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

@@ -1,5 +1,6 @@
package com.cool.store.request;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@@ -18,4 +19,7 @@ public class DistributionInvestmentRequest {
private Long regionId;
@ApiModelProperty("招商所属区域-1024 新增")
private Long investRegionId;
}

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

@@ -15,4 +15,9 @@ public class QueryBigRegionRequest{
private String keyword;
private List<String> groupNameList;
/**
* 类型 1-运营管理组织 2-招商组织
*/
private Integer type;
}

3
coolstore-partner-model/src/main/java/com/cool/store/request/UpdateLineRequest.java
View File

@@ -31,4 +31,7 @@ public class UpdateLineRequest {
@ApiModelProperty("加盟品牌")
private String franchiseBrand;
@ApiModelProperty("招商所属大区-1224新增")
private Long investRegionId;
}

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

@@ -56,6 +56,19 @@ public class BranchShopDetailResponse {
@ApiModelProperty("所属大区id")
private Long regionId;
@ApiModelProperty("招商所属大区id")
private Long investRegionId;
@ApiModelProperty("招商所属大区名称")
private String investRegionName;
@ApiModelProperty("运营顾问")
private String operationsConsultant;
@ApiModelProperty("运营顾问")
private String operationsConsultantName;
@ApiModelProperty("意向开店区域")
private String wantRegionName;

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

@@ -63,6 +63,11 @@ public class BranchShopResponse {
private String storeId;
@ApiModelProperty("招商所属大区")
private Long investRegionId;
@ApiModelProperty("招商所属大区名称")
private String investRegionName;
public void setDays() {
if (this.openingActivityEndTime==null){

6
coolstore-partner-model/src/main/java/com/cool/store/vo/LineInfoVO.java
View File

@@ -35,6 +35,12 @@ public class LineInfoVO {
@ApiModelProperty("战区名称")
private String regionName;
@ApiModelProperty("招商所属大区ID")
private Long investRegionId;
@ApiModelProperty("招商所属大区名称")
private String investRegionName;
@ApiModelProperty("大区ID")
private Long largeRegionId;

3
coolstore-partner-model/src/main/java/com/cool/store/vo/LineListVO.java
View File

@@ -29,6 +29,9 @@ public class LineListVO extends BaseInfoVO{
@ApiModelProperty("更新人名称")
private String updateUserName;
@ApiModelProperty("招商所属区域名称")
private String investRegionName;
public LineListVO(){}
public LineListVO(BaseInfoVO baseInfoVO) {

2
coolstore-partner-model/src/main/java/com/cool/store/vo/PlatformBuildInfoVO.java
View File

@@ -54,4 +54,6 @@ public class PlatformBuildInfoVO {
@ApiModelProperty("招商经理名称")
private String investmentManagerName;
@ApiModelProperty("招商所属大区名称")
private String investRegionName;
}

45
coolstore-partner-model/src/main/java/com/cool/store/vo/desk/OperationsConsultantAssignVO.java Normal file
View File

@@ -0,0 +1,45 @@
package com.cool.store.vo.desk;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Auther zx_szh
* @Date 2025/12/25 15:04
* @Version 1.0
*/
@Data
public class OperationsConsultantAssignVO {
private Long id;
@ApiModelProperty("门店ID")
private Long shopId;
@ApiModelProperty("门店名称")
private String shopName;
@ApiModelProperty("门店编码")
private String shopCode;
@ApiModelProperty("招商所属大区")
private Long investRegionId;
@ApiModelProperty("招商所属大区名称")
private String investRegionName;
@ApiModelProperty("运营所属大区")
private Long regionId;
@ApiModelProperty("运营所属大区名称")
private String regionName;
@ApiModelProperty("招商经理")
private String investmentManager;
@ApiModelProperty("招商经理名称")
private String investmentManagerName;
@ApiModelProperty("加盟商名称")
private String partnerName;
@ApiModelProperty("门店类型 【门店类型】：0-无展示门店、1-餐厅店、2-普通门店")
private Integer storeType;
@ApiModelProperty("签约类型 ")
private Integer signType;
@ApiModelProperty("加盟模式")
private Integer joinMode;
@ApiModelProperty("手机号")
private String partnerPhone;
@ApiModelProperty("店铺地址")
private String shopAddress;
}

6
coolstore-partner-model/src/main/java/com/cool/store/vo/desk/PreparationCommonPendingVO.java
View File

@@ -59,4 +59,10 @@ public class PreparationCommonPendingVO {
@ApiModelProperty("加盟品牌")
private String franchiseBrand;
@ApiModelProperty("招商所属大区ID")
private Long investRegionId;
@ApiModelProperty("招商所属大区名称")
private String investRegionName;
}

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

@@ -69,6 +69,12 @@ public class MiniShopPageVO {
@ApiModelProperty("所属管理区域name")
private String managerRegionName;
@ApiModelProperty("招商所属大区id")
private Long investRegionId;
@ApiModelProperty("招商所属大区名称")
private String investRegionName;
public MiniShopPageVO(Long shopId, String shopName, String shopCode, Boolean flag, Long pointId, Long regionId, String regionName) {
this.shopId = shopId;
this.shopName = shopName;
@@ -110,6 +116,8 @@ public class MiniShopPageVO {
miniShopPageVO.setShopStatus(shopInfo.getShopStatus());
miniShopPageVO.setManagerRegionId(shopInfo.getManagerRegionId());
miniShopPageVO.setManagerRegionName(regionNameMap.getOrDefault(shopInfo.getManagerRegionId(), ""));
miniShopPageVO.setInvestRegionId(shopInfo.getInvestRegionId());
miniShopPageVO.setInvestRegionName(regionNameMap.get(shopInfo.getInvestRegionId()));
resultList.add(miniShopPageVO);
}