From 7b46d1d38540333a59f7bba25af9d5aeabbc16bd Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Tue, 15 Jul 2025 15:39:26 +0800
Subject: [PATCH] 配送类型

---
 oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderReturnServiceImpl.java |   14 ++++++++++++--
 1 files changed, 12 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 1c7ced3..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
@@ -1,6 +1,7 @@
 package com.oying.modules.sh.service.impl;
 
 import com.oying.modules.sh.domain.OrderReturn;
+import com.oying.modules.sh.domain.request.AuditOrderReturn;
 import com.oying.utils.FileUtil;
 import com.oying.utils.enums.ReturnAuditEnum;
 import lombok.RequiredArgsConstructor;
@@ -35,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
@@ -69,6 +73,12 @@
 
     @Override
     @Transactional(rollbackFor = Exception.class)
+    public void audit(AuditOrderReturn resources) {
+
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
     public void deleteAll(List<Long> ids) {
         orderReturnMapper.deleteBatchIds(ids);
     }

--
Gitblit v1.9.3