From c1d20b425b10e8ba59f102dd1ab413055883eed0 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Mon, 14 Jul 2025 16:57:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xin' into pxb
---
oying-common/src/main/java/com/oying/utils/enums/OrderStatusEnum.java | 11 +++++------
1 files changed, 5 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..f7e4a21 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,11 @@
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, "订单已完成"),
UNKNOWN(99, "未知枚举");
private final Integer key;
--
Gitblit v1.9.3