From 38213237cc11c9bd3f11b0fa69c56ef663049a4b Mon Sep 17 00:00:00 2001
From: zepengdev <lzpsmith@outlook.com>
Date: Fri, 29 Aug 2025 11:40:54 +0800
Subject: [PATCH] feat: 店铺地址和坐标合并
---
oying-system/src/main/java/com/oying/modules/message/rest/MesMsgRecordController.java | 4 ++--
1 files changed, 2 insertions(+), 2 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..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) {
--
Gitblit v1.9.3