From b919b454bccc18d67b7109a09357499d09211eac Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Thu, 17 Jul 2025 18:07:08 +0800
Subject: [PATCH] Merge branch 'xin' into pxb
---
oying-common/src/main/java/com/oying/utils/enums/OrderStatusEnum.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 69718a4..b5e7f14 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
@@ -11,12 +11,12 @@
ONE(1, "支付成功"),
TWO(2, "商家已接单"),
THREE(3, "骑手已接单"),
- FOUR(4, "商家已接单"),
- FIVE(5, "商家已备货"),
- SIX(6, "骑手已到店"),
- SEVEN(7, "骑手已取货"),
- EIGHT(8, "商品已送达"),
- NINE(9, "订单已完成"),
+ FOUR(4, "商家已备货"),
+ FIVE(5, "骑手已到店"),
+ SIX(6, "骑手已取货,正在送货"),
+ SEVEN(7, "商品已送达"),
+ EIGHT(8, "订单已完成"),
+ NINE(9, "用户取消订单"),
UNKNOWN(99, "未知枚举");
private final Integer key;
--
Gitblit v1.9.3