From dbb4d61f9b599411a0d8a9d90157244b02f0fca0 Mon Sep 17 00:00:00 2001 From: suzhuhong Date: Mon, 5 Jan 2026 16:38:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=E4=BB=A3=E5=8A=9E+=E7=9D=A3=E5=AF=BC?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=8B=9B=E5=95=86=E7=BB=8F=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/enums/ErrorCodeEnum.java | 2 +- .../close/CloseStoreSubStageStatusEnum.java | 4 +- .../enums/point/ShopSubStageStatusEnum.java | 2 +- .../cool/store/dto/ExportBranchShopDTO.java | 2 +- .../com/cool/store/dto/ExportFinanceDTO.java | 2 +- .../com/cool/store/dto/ExportJoinShopDTO.java | 2 +- .../com/cool/store/dto/ExportProgressDTO.java | 2 +- .../store/dto/PreparationScheduleDTO.java | 70 ------------------- .../store/service/impl/DeskServiceImpl.java | 2 +- 9 files changed, 9 insertions(+), 79 deletions(-) delete mode 100644 coolstore-partner-model/src/main/java/com/cool/store/dto/PreparationScheduleDTO.java diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java index d32282a68..3e56be091 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java @@ -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), diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/close/CloseStoreSubStageStatusEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/close/CloseStoreSubStageStatusEnum.java index 5b087da7f..6ef56841d 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/close/CloseStoreSubStageStatusEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/close/CloseStoreSubStageStatusEnum.java @@ -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), diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java index 7c3745e71..e4e3f5fee 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java @@ -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), diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/ExportBranchShopDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/ExportBranchShopDTO.java index 6168c9068..ec735265d 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/ExportBranchShopDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/ExportBranchShopDTO.java @@ -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; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/ExportFinanceDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/ExportFinanceDTO.java index c7b67e000..560ae5f6c 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/ExportFinanceDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/ExportFinanceDTO.java @@ -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; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/ExportJoinShopDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/ExportJoinShopDTO.java index bed669ff2..3208daed6 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/ExportJoinShopDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/ExportJoinShopDTO.java @@ -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; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/ExportProgressDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/ExportProgressDTO.java index 21f442b60..f595f547e 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/ExportProgressDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/ExportProgressDTO.java @@ -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; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/PreparationScheduleDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/PreparationScheduleDTO.java deleted file mode 100644 index f02db1300..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/PreparationScheduleDTO.java +++ /dev/null @@ -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; - - - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java index fd48ca3c8..431122873 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java @@ -319,7 +319,7 @@ public class DeskServiceImpl implements DeskService { @Override public PageInfo 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); } From b8976902743612761a65823314342e58cbfdc33e Mon Sep 17 00:00:00 2001 From: suzhuhong Date: Mon, 5 Jan 2026 17:07:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fax:=E8=AE=A2=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/service/impl/DeskServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java index 431122873..3727ab1e0 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java @@ -319,7 +319,7 @@ public class DeskServiceImpl implements DeskService { @Override public PageInfo trainListPendingList(DeskRequest deskRequest, LoginUserInfo user) { - return commonPendingVOPageInfo(deskRequest, null, ShopSubStageEnum.SHOP_STAGE_5, + return commonPendingVOPageInfo(deskRequest, user, ShopSubStageEnum.SHOP_STAGE_5, Collections.singletonList(SHOP_SUB_STAGE_STATUS_50.getShopSubStageStatus()), Boolean.TRUE); } @@ -352,7 +352,7 @@ public class DeskServiceImpl implements DeskService { //订单组 只查询待授权的数据 if (userRoleIds.contains(UserRoleEnum.ORDER_GROUP.getCode())) { //只查管辖的待授权的数据 - return commonPendingVOPageInfo(deskRequest, null, ShopSubStageEnum.SHOP_STAGE_17, + return commonPendingVOPageInfo(deskRequest,user , ShopSubStageEnum.SHOP_STAGE_17, Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_172.getShopSubStageStatus()), Boolean.TRUE); } //其他角色能看到