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/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 eb824ff..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
@@ -1,7 +1,7 @@
package com.oying.modules.message.rest;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.oying.modules.message.common.OrderStatusEnum;
+import com.oying.modules.message.common.MsgStatusEnum;
import com.oying.modules.message.common.PlatFormEnum;
import com.oying.modules.message.domain.dto.MesMsgRecordQueryCriteria;
import com.oying.modules.message.domain.myDto.MesMsgRecordQueryOrderDto;
@@ -168,7 +168,7 @@
@ApiOperation("商户端：用店铺id 获取下单订单消息")
public R<List<MesMsgRecordQueryOrderDto>> getPendingOrders(@RequestParam Long shopId) {
try {
- String content = OrderStatusEnum.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 = OrderStatusEnum.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