leomonM
2025-08-30 f5b9f416e37ae69dde62660d51d5d899b8e360ab
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) {