From 206f601b1f2a2e3cb0bf4f5dead01bec9077d8e9 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Thu, 04 Sep 2025 15:28:52 +0800
Subject: [PATCH] Merge branch 'xin' into pxb
---
oying-common/src/main/java/com/oying/utils/enums/OrderStatusEnum.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/oying-common/src/main/java/com/oying/utils/enums/OrderStatusEnum.java b/oying-common/src/main/java/com/oying/utils/enums/OrderStatusEnum.java
index 114841b..5ab2e0b 100644
--- a/oying-common/src/main/java/com/oying/utils/enums/OrderStatusEnum.java
+++ b/oying-common/src/main/java/com/oying/utils/enums/OrderStatusEnum.java
@@ -14,14 +14,15 @@
FOUR(4, "ORDER", "骑手已接单"),
FIVE(5, "ORDER", "骑手已到店"),
SIX(6, "ORDER", "骑手已取货"),
- SEVEN(7, "ORDER", "商品已送达"),
+ SEVEN(7, "ORDER", "订单已送达"),
EIGHT(8, "ORDER", "订单已完成"),
NINE(9, "ORDER", "订单已取消"),
- TEN(10, "REFUND", "申请退款"),
- ELEVEN(11, "REFUND", "申请拒绝"),
+ TEN(10, "REFUND", "退款申请"),
+ ELEVEN(11, "REFUND", "拒绝申请"),
TWELVE(12, "REFUND", "退款申诉"),
- THIRTEEN(13, "REFUND", "申请同意"),
+ THIRTEEN(13, "REFUND", "同意申请"),
FOURTEEN(14, "REFUND", "退款成功"),
+ FIFTEEN(15, "REFUND", "取消退款"),
UNKNOWN(99, "UNKNOWN", "未知枚举");
private final Integer key;
--
Gitblit v1.9.3