From 044a57d2133b2363a6f0d3d167b3eaa587c70b91 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Thu, 31 Jul 2025 17:18:47 +0800
Subject: [PATCH] Merge branch 'pxb' into xin
---
oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderReturnServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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..7be0520 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
@@ -2,6 +2,7 @@
import com.oying.modules.sh.domain.OrderReturn;
import com.oying.modules.sh.domain.request.AuditOrderReturn;
+import com.oying.modules.sh.domain.request.ReturnOrder;
import com.oying.utils.FileUtil;
import com.oying.utils.enums.ReturnAuditEnum;
import lombok.RequiredArgsConstructor;
@@ -36,12 +37,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
@@ -56,8 +60,8 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void create(OrderReturn resources) {
- orderReturnMapper.insert(resources);
+ public void create(ReturnOrder resources) {
+
}
@Override
--
Gitblit v1.9.3