From 07234fed2dc993366fd4c7673d0e8ada90706bd1 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Mon, 15 Sep 2025 11:33:45 +0800
Subject: [PATCH] Merge branch 'pxb' into xin
---
oying-system/src/main/java/com/oying/modules/message/rest/MesMsgRecordController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
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..889c0d6 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
@@ -27,7 +27,7 @@
@Slf4j
@RestController
@RequiredArgsConstructor
-@Api(tags = "消息中心2.0")
+@Api(tags = "消息中心：消息")
@RequestMapping("/api/mesMsgRecord")
public class MesMsgRecordController {
@@ -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) {
--
Gitblit v1.9.3