Merge branch 'refs/heads/master' into xin

xin

2025-10-17 ab0637e981ab4c85120ccde35ee24ec4abbe3e24

 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;
@@ -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 = 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) {