From 2427b05aeca08ee3c4998843bf749d35440d461b Mon Sep 17 00:00:00 2001
From: rentaiming <806181662@qq.com>
Date: 星期六, 15 六月 2024 21:33:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/OrderStatusEnum.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 b971430..cd39232 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,13 +10,15 @@
@AllArgsConstructor
public enum OrderStatusEnum {
- /*订单状态 1=待发货 2=待收货 3=已完成 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, "售后");
+ AFTER_SALE(6, "售后中"),
+ REFUNDED(7, "已退款"),
+ REFUNDED_AND_RETURNED(8, "已退货退款");
@EnumValue
private final int code;
--
Gitblit v1.7.1