From 8d9eca3f5e9f884a14f41d04d1898e2ee7bf9078 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期二, 11 六月 2024 16:08:08 +0800 Subject: [PATCH] 1.提交【管理后台】-营销管理-积分管理相关接口 2.修改websocket代码,增加用户端、拍卖师端类型区分 --- ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/OrderStatusEnum.java | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/OrderStatusEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/OrderStatusEnum.java index f63e689..b971430 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/OrderStatusEnum.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/OrderStatusEnum.java @@ -11,11 +11,12 @@ public enum OrderStatusEnum { /*订单状态 1=待发货 2=待收货 3=已完成 4=已取消*/ - - TO_BE_SHIPPED(1, "待发货"), - GOODS_TO_BE_RECEIVED(2, "待收货"), - FINISHED(3, "已完成"), - CANCELED(4, "已取消"); + TO_PLAY(1, "待支付"), + TO_BE_SHIPPED(2, "待发货"), + GOODS_TO_BE_RECEIVED(3, "待收货"), + FINISHED(4, "已完成"), + CANCELED(5, "已取消"), + AFTER_SALE(6, "售后"); @EnumValue private final int code; -- Gitblit v1.7.1