From d473652b8a9284b8598f24b95922bbd5b608874b Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Tue, 26 Aug 2025 21:34:34 +0800
Subject: [PATCH] Merge branch 'master' into xin
---
oying-system/src/main/java/com/oying/modules/message/common/MsgStatusEnum.java | 101 +++++++++++++++++++++++++++------
oying-system/src/main/java/com/oying/modules/message/rest/MesMsgRecordController.java | 4
oying-system/src/main/java/com/oying/modules/message/service/impl/MesMsgRecordServiceImpl.java | 16 ++--
3 files changed, 92 insertions(+), 29 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/message/common/MsgStatusEnum.java b/oying-system/src/main/java/com/oying/modules/message/common/MsgStatusEnum.java
index 7301ecd..b570094 100644
--- a/oying-system/src/main/java/com/oying/modules/message/common/MsgStatusEnum.java
+++ b/oying-system/src/main/java/com/oying/modules/message/common/MsgStatusEnum.java
@@ -26,24 +26,12 @@
/// 保留骑手已接单、骑手已取货
/// 变量前缀商户 骑手 买家
- /* ========== 商户相关状态 ========== */
- /**
- * 商户：买家下单提醒
- * 商户收到新订单通知
- */
- MERCHANT_ORDER_SUBMITTED(0, "订单已提交"),
-
-// /**
-// * 商户：支付成功通知
-// * 订单支付成功通知商户
-// */
-// MERCHANT_PAYMENT_SUCCESS(1, "支付成功"),
/**
- * 商户：商家已接单
+ * 商户：新接单
* 商户确认接单通知
*/
- MERCHANT_ACCEPTED(2, "商家已接单"),
+ MERCHANT_ACCEPTED(2, "新接单"),
/**
* 商户：商家已备货
@@ -88,11 +76,6 @@
/* ========== 买家相关状态 ========== */
- /**
- * 买家：订单状态变化通知
- * 订单状态更新通知买家
- */
- BUYER_ORDER_STATUS_CHANGED(7, "商品已送达"),
/**
* 买家：订单已完成
@@ -106,6 +89,86 @@
*/
BUYER_ORDER_DELIVERED(13, "订单送达");
+// /* ========== 商户相关状态 ========== */
+// /**
+// * 商户：买家下单提醒
+// * 商户收到新订单通知
+// */
+// MERCHANT_ORDER_SUBMITTED(0, "订单已提交"),
+//
+//// /**
+//// * 商户：支付成功通知
+//// * 订单支付成功通知商户
+//// */
+//// MERCHANT_PAYMENT_SUCCESS(1, "支付成功"),
+//
+// /**
+// * 商户：商家已接单
+// * 商户确认接单通知
+// */
+// MERCHANT_ACCEPTED(2, "商家已接单"),
+//
+// /**
+// * 商户：商家已备货
+// * 商户完成备货通知
+// */
+// MERCHANT_PREPARED(4, "商家已备货"),
+//
+//
+// /* ========== 骑手相关状态 ========== */
+// //加一个骑手取消接单
+// RIDER_CANCEL_ACCEPT(14, "骑手取消接单"),
+// /**
+// * 骑手：有待接单
+// * 骑手端有待接订单通知
+// */
+// RIDER_PENDING_ACCEPTANCE(3, "骑手已接单"),
+//
+// /**
+// * 骑手：骑手已取货
+// * 骑手取货完成通知
+// */
+// RIDER_PICKED_UP(6, "骑手已取货"),
+//
+// /**
+// * 骑手：骑手已到店
+// * 骑手到达商户店铺通知
+// */
+// RIDER_ARRIVED(5, "骑手已到店"),
+//
+// /**
+// * 骑手：订单已取消
+// * 订单取消通知骑手
+// */
+// RIDER_ORDER_CANCELLED(9, "订单已取消"),
+//
+// /**
+// * 骑手：配送超时提醒
+// * 距离最晚送达时间不足提醒，包括不足1小时和不足30分钟两种情况
+// * 系统后台提供的定时提醒状态，在订单创建后59分钟和29分钟时触发
+// */
+// RIDER_DELIVERY_WARNING(10, "配送超时提醒"),
+//
+//
+// /* ========== 买家相关状态 ========== */
+// /**
+// * 买家：订单状态变化通知
+// * 订单状态更新通知买家
+// */
+// BUYER_ORDER_STATUS_CHANGED(7, "商品已送达"),
+//
+// /**
+// * 买家：订单已完成
+// * 订单完成通知买家
+// */
+// BUYER_ORDER_COMPLETED(8, "订单已完成"),
+//
+// /**
+// * 买家：订单送达通知
+// * 订单送达通知买家
+// */
+// BUYER_ORDER_DELIVERED(13, "订单送达");
+
/**
* 反向映射，提升查找速度
*/
diff --git a/oying-system/src/main/java/com/oying/modules/message/rest/MesMsgRecordController.java b/oying-system/src/main/java/com/oying/modules/message/rest/MesMsgRecordController.java
index 702b75a..95821ef 100644
--- a/oying-system/src/main/java/com/oying/modules/message/rest/MesMsgRecordController.java
+++ b/oying-system/src/main/java/com/oying/modules/message/rest/MesMsgRecordController.java
@@ -168,7 +168,7 @@
@ApiOperation("商户端：用店铺id 获取下单订单消息")
public R<List<MesMsgRecordQueryOrderDto>> getPendingOrders(@RequestParam Long shopId) {
try {
- String content = MsgStatusEnum.MERCHANT_ORDER_SUBMITTED.getValue();
+ String content = MsgStatusEnum.MERCHANT_ACCEPTED.getValue();
List<MesMsgRecordQueryOrderDto> res = mesMsgRecordService.queryorderPending(shopId, content);
return R.success(res);
} catch (Exception e) {
@@ -182,7 +182,7 @@
@ApiOperation("商户端：用店铺id 获取订单送达消息")
public R<List<MesMsgRecordQueryOrderDto>> getDeliveredOrders(@RequestParam Long shopId) {
try {
- String content = MsgStatusEnum.BUYER_ORDER_STATUS_CHANGED.getValue();
+ String content = MsgStatusEnum.BUYER_ORDER_DELIVERED.getValue();
List<MesMsgRecordQueryOrderDto> res = mesMsgRecordService.queryorderPending(shopId, content);
return R.success(res);
} catch (Exception e) {
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 416a68e..c3f6531 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
@@ -142,8 +142,8 @@
public void setBuyerStatusOrderSubmitted(String buyerId, String buyerName, String orderNo, Long shopId, String riderId, String riderName) {
MesMsgRecord record = new MesMsgRecord();
record.setOrderNo(orderNo);
- record.setContent(MsgStatusEnum.MERCHANT_ORDER_SUBMITTED.getValue()); // 使用枚举的描述作为消息内容
- record.setContentKey(String.valueOf(MsgStatusEnum.MERCHANT_ORDER_SUBMITTED.getKey()));// 使用枚举的描述作为消息内容key
+ record.setContent(MsgStatusEnum.MERCHANT_ACCEPTED.getValue()); // 使用枚举的描述作为消息内容
+ record.setContentKey(String.valueOf(MsgStatusEnum.MERCHANT_ACCEPTED.getKey()));// 使用枚举的描述作为消息内容key
record.setBuyerId(buyerId != null ? buyerId : ""); // 处理空值情况
record.setMsgType(MesTypeEnum.ORDER.getKey()); // 订单消息类型为2
record.setIsRead(MesReadEnum.UNREAD.getKey()); // 默认未读 0
@@ -169,8 +169,8 @@
public void setBuyerStatusOrderDelivered(String buyerId, String buyerName, String orderNo, Long shopId, String riderId, String riderName) {
MesMsgRecord record = new MesMsgRecord();
record.setOrderNo(orderNo);
- record.setContent(MsgStatusEnum.BUYER_ORDER_STATUS_CHANGED.getValue()); // 使用枚举的描述作为消息内容
- record.setContentKey(String.valueOf(MsgStatusEnum.BUYER_ORDER_STATUS_CHANGED.getKey()));// 使用枚举的描述作为消息内容key
+ record.setContent(MsgStatusEnum.BUYER_ORDER_DELIVERED.getValue()); // 使用枚举的描述作为消息内容
+ record.setContentKey(String.valueOf(MsgStatusEnum.BUYER_ORDER_DELIVERED.getKey()));// 使用枚举的描述作为消息内容key
record.setBuyerId(buyerId != null ? buyerId : ""); // 处理空值情况
record.setMsgType(MesTypeEnum.ORDER.getKey()); // 订单消息类型为2
record.setIsRead(MesReadEnum.UNREAD.getKey()); // 默认未读 0
@@ -196,9 +196,9 @@
public void setBuyerStatusOrderDelivered(String buyerId, String buyerName, String orderNo, Long shopId, MsgStatusEnum content, String riderId, String riderName) {
//content只能设置为如下 "商品已送达" "订单已完成" "订单送达"
if (content == null ||
- (!content.equals(MsgStatusEnum.BUYER_ORDER_STATUS_CHANGED) &&
+ (
!content.equals(MsgStatusEnum.BUYER_ORDER_COMPLETED) &&
- !content.equals(MsgStatusEnum.BUYER_ORDER_DELIVERED))) {
+ !content.equals(MsgStatusEnum.BUYER_ORDER_DELIVERED))) {
throw new IllegalArgumentException("content只能设置为如下 \"商品已送达\" \"订单已完成\" \"订单送达\"");
}
MesMsgRecord record = new MesMsgRecord();
@@ -230,9 +230,9 @@
public void setSellerStatusOrderDelivered(String buyerId, String buyerName, String orderNo, Long shopId, MsgStatusEnum content, String riderId, String riderName) {
//content只能为 "订单已提交" "商家已接单" 商家已备货"
if (content == null ||
- (content != MsgStatusEnum.MERCHANT_ORDER_SUBMITTED &&
+ (
content != MsgStatusEnum.MERCHANT_ACCEPTED &&
- content != MsgStatusEnum.MERCHANT_PREPARED)) {
+ content != MsgStatusEnum.MERCHANT_PREPARED)) {
throw new IllegalArgumentException("content只能为 \"订单已提交\" \"商家已接单\" 商家已备货\"");
}
MesMsgRecord record = new MesMsgRecord();
--
Gitblit v1.9.3