Merge #91 into master from cc_20230331_device

feat：添加阶段状态 * cc_20230331_device: (21 commits squashed) - feat：添加采购审批 - Merge branch 'master' into cc_20230331_device - feat：设备发货阶段 - feat：设备发货 - feat：设备发货 - feat：接口调整 - feat：接口调整 - feat：接口调整 - feat：接口调整 - feat：接口调整 - feat：接口调整 - feat：接口调整 - feat：接口调整 - feat：查询订单设备明细 - feat：测试 - feat：短信模板切换 - feat：getPendingList - feat：代办调整 - feat：处理人 - feat：添加阶段状态 - Merge branch 'master' into cc_20230331_device # Conflicts: #	coolstore-partner-service/src/main/java/com/cool/store/service/order/impl/MiniStoreOrderServiceImpl.java #	coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TestController.java Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com> Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com> CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/91
2026-04-12 09:16:48 +00:00
parent 77ca18b6fc
commit 1a77d8fc37
48 changed files with 1874 additions and 106 deletions
--- a/coolstore-partner-common/src/main/java/com/cool/store/enums/DeliveryItemTypeEnum.java
+++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/DeliveryItemTypeEnum.java
@@ -0,0 +1,36 @@
+package com.cool.store.enums;
+
+
+/**
+ * 发货项类型枚举
+ */
+public enum DeliveryItemTypeEnum {
+
+    PURCHASE_DEVICE(1, "采购设备"),
+    FIRE_CODE_DEVICE(2, "火码设备");
+
+    private final Integer code;
+    private final String desc;
+
+    DeliveryItemTypeEnum(Integer code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public static DeliveryItemTypeEnum getByCode(Integer code) {
+        for (DeliveryItemTypeEnum item : values()) {
+            if (item.getCode().equals(code)) {
+                return item;
+            }
+        }
+        return null;
+    }
+}
--- a/coolstore-partner-common/src/main/java/com/cool/store/enums/DeliveryPlanStageEnum.java
+++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/DeliveryPlanStageEnum.java
@@ -0,0 +1,37 @@
+package com.cool.store.enums;
+
+
+/**
+ * 门店发货阶段枚举
+ */
+public enum DeliveryPlanStageEnum  {
+
+    PENDING_DELIVERY(1, "待发货"),
+    PARTIAL_DELIVERY(2, "部分发货"),
+    COMPLETED(3, "已完成");
+
+    private final Integer code;
+    private final String desc;
+
+    DeliveryPlanStageEnum(Integer code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public static DeliveryPlanStageEnum getByCode(Integer code) {
+        for (DeliveryPlanStageEnum item : values()) {
+            if (item.getCode().equals(code)) {
+                return item;
+            }
+        }
+        return null;
+    }
+}
--- a/coolstore-partner-common/src/main/java/com/cool/store/enums/DeliveryStatusEnum.java
+++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/DeliveryStatusEnum.java
@@ -0,0 +1,36 @@
+package com.cool.store.enums;
+
+
+/**
+ * 发货状态枚举
+ */
+public enum DeliveryStatusEnum  {
+
+    NOT_DELIVERED(0, "未发货"),
+    DELIVERED(1, "已发货");
+
+    private final Integer code;
+    private final String desc;
+
+    DeliveryStatusEnum(Integer code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public static DeliveryStatusEnum getByCode(Integer code) {
+        for (DeliveryStatusEnum item : values()) {
+            if (item.getCode().equals(code)) {
+                return item;
+            }
+        }
+        return null;
+    }
+}
--- 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
@@ -364,7 +364,8 @@ public enum ErrorCodeEnum {
    CURRENT_ORDER_STATUS_NOT_SUPPORT_CHANGE(1610111, "当前订单状态不支持变换心愿单！", null),
    CURRENT_WISHLIST_BIND_OTHER_POINT(1610112, "当前心愿单绑定了其他铺位！", null),
    ORDER_DATA_EXCEPTION(1610113, "心愿单数据异常！", null),
-    CURRENT_WISHLIST_NOT_EXIST(1610112, "当前心愿单不存在！", null),
+    CURRENT_WISHLIST_NOT_EXIST(1610114, "当前心愿单不存在！", null),
+    AMOUNT_GEN_ZERO(1610115, "分账金额必须大于0！", null),



--- a/coolstore-partner-common/src/main/java/com/cool/store/enums/FileTypeEnum.java
+++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/FileTypeEnum.java
@@ -22,7 +22,7 @@ public enum FileTypeEnum {
    IMPORT_OA_OLD_SHOP_DATA("importOaOldShopData", "导入OA旧数据"),
    ZXJP_OPEN_SHOP_REPORT("zxjpOpenShopReport","正新鸡排开店"),
    IMPORT_OA_OLD_SHOP_STAGE_DATA("importOaOldShopStageData", "导入OA旧阶段数据"),
-    IMPORT_OA_OLD_SHOP_STAGE_DATA_ERROR("OaOldShopStageDataError", "导入OA旧数据阶段错误列表"),
+    IMPORT_OA_OLD_SHOP_STAGE_DATA_ERROR("OaOldShopStageDataErrorList", "导入OA旧数据阶段错误列表 "),
    IMPORT_FITMENT_SHOP_STAGE("importFitmentShopStage", "导入装修阶段完成数据"),
    IMPORT_FITMENT_SHOP_STAGE_DATA_ERROR_LIST("OaOldShopStageDataErrorList", "导入装修阶段完成数据错误列表 "),
    SELLING_DETAILS_REPORT("sellingDetailsReport", "开店明细报表"),
@@ -33,6 +33,7 @@ public enum FileTypeEnum {
    ORDER_RECORD_EXPORT("orderRecordExport", "订单记录列表"),
    POINT_EXPORT("pointExport", "铺位管理列表"),
    MY_POINT_EXPORT("myPointExport", "我的铺位管理列表"),
+    ORDER_DEVICE_DETAIL_EXPORT("orderDeviceDetailExport", "订单设备明细导出"),
    ;
    private String fileType;
    private String desc;
--- a/coolstore-partner-common/src/main/java/com/cool/store/enums/SMSMsgEnum.java
+++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/SMSMsgEnum.java
@@ -12,6 +12,9 @@ public enum SMSMsgEnum {
    DESIGN_STAGE("设计阶段", "", "SMS_498750214"),
    CONSTRUCTION_STAGE("施工阶段", "", "SMS_498870170"),
    PLATFORM_BUILD_STORE("平台建店", "", "SMS_498730163"),
+    DEVICE_NOTICE("设备发货通知", "${partnerName}-门店${shopName}可安排设备发货，期望发货日期为${shippingDate}，请核对订单后安排发货，详情明细请登录CRM酷店掌-CRM首页-开店管理查看。", "SMS_504735256"),
+
+
    ;

    private String title;
--- a/coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java
+++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java
@@ -76,6 +76,8 @@ public enum UserRoleEnum {
    OPERATION_GENERAL_CONSULTANT(1764642515446L,"运营片区总顾问"),
    ORDER_GROUP(1766387359609L,"订单组"),
    AI_STORE_TYPE_APPROVE(1774252055402L,"AI店型订单审核"),
+    DEVICE_SHIPMENT_HM(1775108261858L,"设备发货-火码"),
+    DEVICE_SHIPMENT_CG(1775108280524L,"设备发货-采购")
    ;

    private Long code;
--- a/coolstore-partner-common/src/main/java/com/cool/store/enums/order/StoreOrderStatusEnum.java
+++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/order/StoreOrderStatusEnum.java
@@ -12,6 +12,7 @@ public enum StoreOrderStatusEnum {

    DRAFT(0, "草稿"),
    WAIT_CONFIRM(5, "待立规确认"),
+    DEVICE_CONFIRM(6, "待采购设备确认"),
    INVEST_MANAGER_CONFIRM(7, "待加盟商确认"),
    FINANCIAL_CONFIRM(8, "待内勤确认"),
    WAIT_ADJUST(10, "待调整"),
@@ -37,14 +38,6 @@ public enum StoreOrderStatusEnum {
    }


-    /**
-     * 可撤回阶段
-     * @param code
-     * @return
-     */
-    public static boolean canWithdraw(Integer code) {
-        return WAIT_CONFIRM.getCode().equals(code) || WAIT_PAY.getCode().equals(code)||INVEST_MANAGER_CONFIRM.getCode().equals(code);
-    }

    /**
     * 待审核状态
@@ -52,6 +45,15 @@ public enum StoreOrderStatusEnum {
     * @return
     */
    public static boolean approve(Integer code) {
-        return WAIT_CONFIRM.getCode().equals(code) || INVEST_MANAGER_CONFIRM.getCode().equals(code);
+        return WAIT_CONFIRM.getCode().equals(code) || INVEST_MANAGER_CONFIRM.getCode().equals(code) || DEVICE_CONFIRM.getCode().equals(code);
+    }
+
+    /**
+     * 后台管理订单 只有立规确认或者设备确认的时候可以修改
+     * @param code
+     * @return
+     */
+    public static boolean managerOrder(Integer code) {
+        return WAIT_CONFIRM.getCode().equals(code) ||  DEVICE_CONFIRM.getCode().equals(code);
    }
 }
--- a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageEnum.java
+++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageEnum.java
@@ -45,6 +45,7 @@ public enum ShopSubStageEnum {
    SHOP_STAGE_27(ShopStageEnum.SHOP_STAGE_2, 270, "开业验收", 1),
    SHOP_STAGE_28(ShopStageEnum.SHOP_STAGE_2, 280, "生成预定订单", 1),

+    SHOP_STAGE_29(ShopStageEnum.SHOP_STAGE_2, 290, "设备发货", 1),

    SHOP_STAGE_30(ShopStageEnum.SHOP_STAGE_2, 300, "开业日期报备", 1),

@@ -159,6 +160,7 @@ public enum ShopSubStageEnum {
                    return ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_00;
                }
            case SHOP_STAGE_28:
+            case SHOP_STAGE_29:
                if (userStrandard==1){
                    //是标准店 需要选择店型 其他情况不需要选择店型
                    return ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_00;
--- 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
@@ -169,6 +169,7 @@ public enum ShopSubStageStatusEnum {

    SHOP_SUB_STAGE_STATUS_280(ShopSubStageEnum.SHOP_STAGE_28, 2800, "待选购", Boolean.FALSE),
    SHOP_SUB_STAGE_STATUS_281(ShopSubStageEnum.SHOP_STAGE_28, 2810, "待立规确认", Boolean.FALSE),
+    SHOP_SUB_STAGE_STATUS_281_2(ShopSubStageEnum.SHOP_STAGE_28, 2812, "待采购设备确认", Boolean.FALSE),
    SHOP_SUB_STAGE_STATUS_281_5(ShopSubStageEnum.SHOP_STAGE_28, 2815, "待加盟商确认", Boolean.FALSE),
    SHOP_SUB_STAGE_STATUS_282(ShopSubStageEnum.SHOP_STAGE_28, 2820, "待内勤确认分账", Boolean.FALSE),
    SHOP_SUB_STAGE_STATUS_283(ShopSubStageEnum.SHOP_STAGE_28, 2830, "审批拒绝", Boolean.FALSE),
@@ -176,6 +177,10 @@ public enum ShopSubStageStatusEnum {
    SHOP_SUB_STAGE_STATUS_284_5(ShopSubStageEnum.SHOP_STAGE_28, 2845, "对账中", Boolean.FALSE),
    SHOP_SUB_STAGE_STATUS_285(ShopSubStageEnum.SHOP_STAGE_28, 2850, "已完成", Boolean.TRUE),

+    SHOP_SUB_STAGE_STATUS_290(ShopSubStageEnum.SHOP_STAGE_29, 2900, "待通知发货", Boolean.FALSE),
+    SHOP_SUB_STAGE_STATUS_291(ShopSubStageEnum.SHOP_STAGE_29, 2910, "已通知发货", Boolean.FALSE),
+    SHOP_SUB_STAGE_STATUS_292(ShopSubStageEnum.SHOP_STAGE_29, 2920, "部分发货", Boolean.FALSE),
+    SHOP_SUB_STAGE_STATUS_294(ShopSubStageEnum.SHOP_STAGE_29, 2940, "已完成", Boolean.TRUE),

    //开业日期报备
    SHOP_SUB_STAGE_STATUS_300(ShopSubStageEnum.SHOP_STAGE_30, 3000, "待填写", Boolean.FALSE),