From f422860fe7e521f4d252e5d77621d92d7f8dfe61 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 28 四月 2026 16:28:15 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
server/services/src/main/java/com/doumee/service/business/impl/WithdrawalOrdersServiceImpl.java | 5 ++++-
1 files changed, 4 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 227dc93..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
@@ -217,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