From 3d1c46677a3fb95a4d776735925047c08dee17a3 Mon Sep 17 00:00:00 2001 From: rentaiming <806181062@qq.com> Date: 星期五, 07 六月 2024 18:17:52 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- 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