From 4ab710d8d70017f090dd9601099ded1a50a58a10 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 27 四月 2026 22:34:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/service/business/impl/WithdrawalOrdersServiceImpl.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/WithdrawalOrdersServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/WithdrawalOrdersServiceImpl.java
index 3fec8ed..cb33c0e 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/WithdrawalOrdersServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/WithdrawalOrdersServiceImpl.java
@@ -182,6 +182,15 @@
if (pageWrap.getModel().getCreateEndTime() != null) {
queryWrapper.le(WithdrawalOrders::getCreateTime, Utils.Date.getEnd(pageWrap.getModel().getCreateEndTime()));
}
+ // 闂ㄥ簵绔細鎸夐棬搴楀悕绉版垨鑱旂郴浜烘ā绯婃悳绱�
+ if (StringUtils.isNotBlank(pageWrap.getModel().getShopName())) {
+ queryWrapper.and(i -> i.like(ShopInfo::getName, pageWrap.getModel().getShopName())
+ .or().like(ShopInfo::getLinkName, pageWrap.getModel().getShopName()));
+ }
+ // 鍙告満绔細鎸夊徃鏈哄鍚嶆ā绯婃悳绱�
+ if (StringUtils.isNotBlank(pageWrap.getModel().getMemberName())) {
+ queryWrapper.like(DriverInfo::getName, pageWrap.getModel().getMemberName());
+ }
for (PageWrap.SortData sortData : pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
queryWrapper.orderByDesc(sortData.getProperty());
@@ -208,7 +217,10 @@
queryWrapper.select("IFNULL(SUM(amount), 0) as amount");
Utils.MP.blankToNull(pageWrap.getModel());
queryWrapper.lambda().eq(WithdrawalOrders::getDeleted, Constants.ZERO);
- queryWrapper.lambda().in(WithdrawalOrders::getStatus, Arrays.asList(Constants.ZERO, Constants.ONE));
+ queryWrapper.lambda().eq(WithdrawalOrders::getStatus, Constants.ONE);
+ if (pageWrap.getModel().getMemberType() != null) {
+ queryWrapper.lambda().eq(WithdrawalOrders::getMemberType, pageWrap.getModel().getMemberType());
+ }
if (pageWrap.getModel().getOutBillNo() != null) {
queryWrapper.lambda().like(WithdrawalOrders::getOutBillNo, pageWrap.getModel().getOutBillNo());
}
--
Gitblit v1.9.3