From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/OrderStatusEnum.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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..1208f0b 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
@@ -10,12 +10,13 @@
@AllArgsConstructor
public enum OrderStatusEnum {
- /*订单状态 1=待发货 2=待收货 3=已完成 4=已取消*/
-
- TO_BE_SHIPPED(1, "待发货"),
- GOODS_TO_BE_RECEIVED(2, "待收货"),
- FINISHED(3, "已完成"),
- CANCELED(4, "已取消");
+ /*订单状态 1=待发货 2=待收货 3=已完成 4=已取消 5=售后中 6=售后中 7=已退款 8=已退货退款*/
+ 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