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

Merge #20 into master from cc_20260105_fix

Browse Source 
feat:代办+督导改为招商经理

* cc_20260105_fix: (1 commits squashed)

  - feat:代办+督导改为招商经理

Signed-off-by: 苏竹红 <570057076@qq.com>
Merged-by: 苏竹红 <570057076@qq.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/20
This commit is contained in:
苏竹红
2026-01-05 08:39:42 +00:00
parent 876b00b9ad
commit f6b2b4ccf5
9 changed files with 9 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
View File

@@ -88,7 +88,7 @@ public enum ErrorCodeEnum {
NO_TRANSFER_REQUIRED(500013, "招商经理现有私海线索无需转让，请检查后重试！", null),
NO_BATCH_TRANSFER_REQUIRED(500014, "已选线索包含此招商经理现有私海线索，无需转让，请检查后重试!", null),
PARTNER_MOBILE_EXIST(500010, "手机号码已存在，请核实！", null),
MOBILE_EXIST(500015, "此手机号码已存在，线索所属列表：{0}，督导：{1}，创建日期：{2}", null),
MOBILE_EXIST(500015, "此手机号码已存在，线索所属列表：{0}，招商经理：{1}，创建日期：{2}", null),
INVESTMENT_MANAGER_NOT_EXIST(500016, "当前招商经理不存在", null),
PARTNER_MOBILE_EXIST_0(500017, "手机号码已存在", null),
TIME_OCCUPIED(500018, "预约时间被占用", null),

4
coolstore-partner-common/src/main/java/com/cool/store/enums/close/CloseStoreSubStageStatusEnum.java
View File

@@ -19,8 +19,8 @@ public enum CloseStoreSubStageStatusEnum {
*/
CLOSE_STORE_SUB_STAGE_STATUS_10(CloseStoreSubStageEnum.CLOSE_STORE_SUB_STAGE_10, 100, "待内勤填写地址", Boolean.FALSE),
CLOSE_STORE_SUB_STAGE_STATUS_15(CloseStoreSubStageEnum.CLOSE_STORE_SUB_STAGE_10, 110, "未提交", Boolean.FALSE),
CLOSE_STORE_SUB_STAGE_STATUS_16(CloseStoreSubStageEnum.CLOSE_STORE_SUB_STAGE_10, 120, "待督导审核", Boolean.FALSE),
CLOSE_STORE_SUB_STAGE_STATUS_17(CloseStoreSubStageEnum.CLOSE_STORE_SUB_STAGE_10, 130, "督导审批驳回", Boolean.FALSE),
CLOSE_STORE_SUB_STAGE_STATUS_16(CloseStoreSubStageEnum.CLOSE_STORE_SUB_STAGE_10, 120, "待招商经理审核", Boolean.FALSE),
CLOSE_STORE_SUB_STAGE_STATUS_17(CloseStoreSubStageEnum.CLOSE_STORE_SUB_STAGE_10, 130, "招商经理审批驳回", Boolean.FALSE),
CLOSE_STORE_SUB_STAGE_STATUS_18(CloseStoreSubStageEnum.CLOSE_STORE_SUB_STAGE_10, 140, "待内勤审核", Boolean.FALSE),
CLOSE_STORE_SUB_STAGE_STATUS_19(CloseStoreSubStageEnum.CLOSE_STORE_SUB_STAGE_10, 150, "内勤审批驳回", Boolean.FALSE),
CLOSE_STORE_SUB_STAGE_STATUS_20(CloseStoreSubStageEnum.CLOSE_STORE_SUB_STAGE_10, 160, "已完成", Boolean.TRUE),

2
coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java
View File

@@ -21,7 +21,7 @@ public enum ShopSubStageStatusEnum {
//上传租赁合同
SHOP_SUB_STAGE_STATUS_20(ShopSubStageEnum.SHOP_STAGE_2, 200, "待加盟商上传", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_21(ShopSubStageEnum.SHOP_STAGE_2, 210, "待督导审核", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_21(ShopSubStageEnum.SHOP_STAGE_2, 210, "待招商经理审核", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_22(ShopSubStageEnum.SHOP_STAGE_2, 220, "审核未通过", Boolean.FALSE),
SHOP_SUB_STAGE_STATUS_23(ShopSubStageEnum.SHOP_STAGE_2, 230, "审核通过", Boolean.TRUE),

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

@@ -46,7 +46,7 @@ public class ExportBranchShopDTO {
@ColumnWidth(30)
private String franchiseBrand;
@ExcelProperty(value = "督导",order = 7)
@ExcelProperty(value = "招商经理",order = 7)
@ColumnWidth(30)
private String investmentManager;

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

@@ -45,7 +45,7 @@ public class ExportFinanceDTO {
@ColumnWidth(20)
private String regionName;
@ExcelProperty(value = "督导", order = 9) // 原先是 8，现在调整为 9
@ExcelProperty(value = "招商经理", order = 9) // 原先是 8，现在调整为 9
@ColumnWidth(20)
private String investmentManagerName;

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

@@ -44,7 +44,7 @@ public class ExportJoinShopDTO {
@ColumnWidth(20)
private String regionName;
@ExcelProperty(value = "督导", order = 9)
@ExcelProperty(value = "招商经理", order = 9)
@ColumnWidth(20)
private String investmentManagerName;

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

@@ -52,7 +52,7 @@ public class ExportProgressDTO {
@ColumnWidth(20)
private String regionName;
@ExcelProperty(value = "督导", order = 11)
@ExcelProperty(value = "招商经理", order = 11)
@ColumnWidth(20)
private String investmentManagerName;

70
coolstore-partner-model/src/main/java/com/cool/store/dto/PreparationScheduleDTO.java
View File

@@ -1,70 +0,0 @@
package com.cool.store.dto;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentStyle;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.poi.ss.usermodel.HorizontalAlignment;
import java.time.temporal.ChronoUnit;
import java.util.Date;
@Data
@ContentStyle(horizontalAlignment = HorizontalAlignment.LEFT,wrapped = true)
public class PreparationScheduleDTO {
@ExcelProperty("加盟商名称")
@ColumnWidth(30)
@ApiModelProperty("加盟商名称")
private String username;
@ExcelProperty("加盟商手机号")
@ColumnWidth(30)
@ApiModelProperty("加盟手机号")
private String mobile;
@ExcelProperty("门店名称")
@ColumnWidth(30)
@ApiModelProperty("门店名称")
private String shopName;
@ExcelProperty("门店编号")
@ColumnWidth(30)
@ApiModelProperty("门店编码")
private String shopCode;
@ExcelProperty("当前进度")
@ColumnWidth(30)
@ApiModelProperty("当前进度")
private String currentProgress;
@ExcelProperty("计划开店时间")
@ColumnWidth(30)
@ApiModelProperty("计划开店时间")
private String planOpenTime;
@ExcelProperty("开店时长(天)")
@ColumnWidth(30)
@ApiModelProperty("开店时长")
private String days;
@ExcelProperty("所属区域")
@ColumnWidth(30)
@ApiModelProperty("所属站区")
private String regionNodeName;
@ExcelProperty("招商经理")
@ColumnWidth(30)
@ApiModelProperty("招商经理名称")
private String investmentManagerName;
@ExcelProperty("督导")
@ColumnWidth(30)
@ApiModelProperty("督导")
private String supervisionName;
}

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

@@ -319,7 +319,7 @@ public class DeskServiceImpl implements DeskService {
@Override
public PageInfo<PreparationCommonPendingVO> trainListPendingList(DeskRequest deskRequest, LoginUserInfo user) {
return commonPendingVOPageInfo(deskRequest, user, ShopSubStageEnum.SHOP_STAGE_5,
return commonPendingVOPageInfo(deskRequest, null, ShopSubStageEnum.SHOP_STAGE_5,
Collections.singletonList(SHOP_SUB_STAGE_STATUS_50.getShopSubStageStatus()), Boolean.TRUE);
}