From 844b27d298daca54e54d6f98c61a93da88909e5c Mon Sep 17 00:00:00 2001
From: leomonM <2233021400@qq.com>
Date: Fri, 22 Aug 2025 19:19:00 +0800
Subject: [PATCH] 枚举字段
---
oying-system/src/main/java/com/oying/modules/message/common/OrderStatusEnum.java | 25 +++++++++++--------------
oying-system/src/main/java/com/oying/modules/message/service/impl/MesMsgRecordServiceImpl.java | 6 ++----
2 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/message/common/OrderStatusEnum.java b/oying-system/src/main/java/com/oying/modules/message/common/OrderStatusEnum.java
index 898915a..1fcc66d 100644
--- a/oying-system/src/main/java/com/oying/modules/message/common/OrderStatusEnum.java
+++ b/oying-system/src/main/java/com/oying/modules/message/common/OrderStatusEnum.java
@@ -33,11 +33,11 @@
*/
MERCHANT_ORDER_SUBMITTED(0, "订单已提交"),
- /**
- * 商户：支付成功通知
- * 订单支付成功通知商户
- */
- MERCHANT_PAYMENT_SUCCESS(1, "支付成功"),
+// /**
+// * 商户：支付成功通知
+// * 订单支付成功通知商户
+// */
+// MERCHANT_PAYMENT_SUCCESS(1, "支付成功"),
/**
* 商户：商家已接单
@@ -53,6 +53,8 @@
/* ========== 骑手相关状态 ========== */
+ //加一个骑手取消接单
+ RIDER_CANCEL_ACCEPT(14, "骑手取消接单"),
/**
* 骑手：有待接单
* 骑手端有待接订单通知
@@ -78,16 +80,11 @@
RIDER_ORDER_CANCELLED(9, "订单已取消"),
/**
- * 骑手：距离最晚送达时间不足1小时
- * 系统后台提供的定时提醒状态，在订单创建后59分钟时触发
+ * 骑手：配送超时提醒
+ * 距离最晚送达时间不足提醒，包括不足1小时和不足30分钟两种情况
+ * 系统后台提供的定时提醒状态，在订单创建后59分钟和29分钟时触发
*/
- RIDER_DELIVERY_WARNING_1H(10, "距离最晚送达时间不足1小时"),
-
- /**
- * 骑手：距离最晚送达时间不足30分钟
- * 系统后台提供的定时提醒状态，在订单创建后29分钟时触发
- */
- RIDER_DELIVERY_WARNING_30MIN(11, "距离最晚送达时间不足30分钟"),
+ RIDER_DELIVERY_WARNING(10, "配送超时提醒"),
/* ========== 买家相关状态 ========== */
diff --git a/oying-system/src/main/java/com/oying/modules/message/service/impl/MesMsgRecordServiceImpl.java b/oying-system/src/main/java/com/oying/modules/message/service/impl/MesMsgRecordServiceImpl.java
index 4fb071b..be9c78d 100644
--- a/oying-system/src/main/java/com/oying/modules/message/service/impl/MesMsgRecordServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/message/service/impl/MesMsgRecordServiceImpl.java
@@ -266,10 +266,8 @@
(content != OrderStatusEnum.RIDER_PENDING_ACCEPTANCE &&
content != OrderStatusEnum.RIDER_PICKED_UP &&
content != OrderStatusEnum.RIDER_ARRIVED &&
- content != OrderStatusEnum.RIDER_ORDER_CANCELLED &&
- content != OrderStatusEnum.RIDER_DELIVERY_WARNING_1H &&
- content != OrderStatusEnum.RIDER_DELIVERY_WARNING_30MIN)) {
- throw new IllegalArgumentException("content只能为 \"骑手已接单\" \"骑手已取货\" \"骑手已到店\" \"订单已取消\" \"距离最晚送达时间不足1小时\" \"距离最晚送达时间不足30分钟\"");
+ content != OrderStatusEnum.RIDER_ORDER_CANCELLED && content != OrderStatusEnum.RIDER_DELIVERY_WARNING)) {
+ throw new IllegalArgumentException("content只能为 \"骑手已接单\" \"骑手已取货\" \"骑手已到店\" \"订单已取消\" \"订单已超时\" ");
}
MesMsgRecord record = new MesMsgRecord();
record.setOrderNo(orderNo);
--
Gitblit v1.9.3