From d2985d31ba7b387749b2350882172f675b923347 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Mon, 14 Jul 2025 16:22:38 +0800
Subject: [PATCH] 订单流程补充

---
 oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderReturnServiceImpl.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderReturnServiceImpl.java b/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderReturnServiceImpl.java
index 3ad516b..f8fe21d 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderReturnServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderReturnServiceImpl.java
@@ -36,12 +36,15 @@
 
     @Override
     public PageResult<OrderReturn> queryAll(OrderReturnQueryCriteria criteria, Page<Object> page) {
-        return PageUtil.toPage(orderReturnMapper.findAll(criteria, page));
+        criteria.setOffset(page.offset());
+        List<OrderReturn> list = orderReturnMapper.findAll(criteria, criteria.getBlurry());
+        Long total = orderReturnMapper.countAll(criteria, criteria.getBlurry());
+        return PageUtil.toPage(list, total);
     }
 
     @Override
     public List<OrderReturn> queryAll(OrderReturnQueryCriteria criteria) {
-        return orderReturnMapper.findAll(criteria);
+        return orderReturnMapper.findAll(criteria, criteria.getBlurry());
     }
 
     @Override

--
Gitblit v1.9.3