From 2f9c6c19ab552bf984e9fd9df8126b18a86c723c Mon Sep 17 00:00:00 2001 From: tianfeng <769204422@qq.com> Date: Fri, 5 Dec 2025 20:41:44 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E6=9B=B4=E6=94=B9"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 70742b33621e12f0c69243c45250d41cd38c373e. --- .../impl/FreightBalanceRunningWaterServiceImpl.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/rc-service/rc-service-wallet/wallet-infrastructure/src/main/java/com/red/circle/wallet/infra/database/rds/service/freight/impl/FreightBalanceRunningWaterServiceImpl.java b/rc-service/rc-service-wallet/wallet-infrastructure/src/main/java/com/red/circle/wallet/infra/database/rds/service/freight/impl/FreightBalanceRunningWaterServiceImpl.java index 7b6dcaaa..329ebd95 100644 --- a/rc-service/rc-service-wallet/wallet-infrastructure/src/main/java/com/red/circle/wallet/infra/database/rds/service/freight/impl/FreightBalanceRunningWaterServiceImpl.java +++ b/rc-service/rc-service-wallet/wallet-infrastructure/src/main/java/com/red/circle/wallet/infra/database/rds/service/freight/impl/FreightBalanceRunningWaterServiceImpl.java @@ -39,9 +39,16 @@ public class FreightBalanceRunningWaterServiceImpl extends @Override public List flowByUserId(Long userId, Long acceptUserId, Integer type, Long lastId) { return query() - .eq(FreightBalanceRunningWater::getUserId, userId) - .eq(Objects.nonNull(acceptUserId), FreightBalanceRunningWater::getAcceptUserId, acceptUserId) - .eq(Objects.nonNull(type), FreightBalanceRunningWater::getType, type) + .and(Objects.isNull(acceptUserId), wrapper -> wrapper + .eq(FreightBalanceRunningWater::getUserId, userId) + .or() + .eq(FreightBalanceRunningWater::getAcceptUserId, userId) + ) + .and(Objects.nonNull(acceptUserId), e -> e + .eq(FreightBalanceRunningWater::getUserId, userId) + .or() + .eq(FreightBalanceRunningWater::getAcceptUserId, acceptUserId)) + .and(Objects.nonNull(type), e -> e.eq(FreightBalanceRunningWater::getType, type)) .lt(Objects.nonNull(lastId), FreightBalanceRunningWater::getId, lastId) .orderByDesc(FreightBalanceRunningWater::getId) .last(PageConstant.DEFAULT_LIMIT)