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 080c47e1..0b47350e 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,7 +39,11 @@ public class FreightBalanceRunningWaterServiceImpl extends @Override public List flowByUserId(Long userId, Long lastId) { return query() - .eq(FreightBalanceRunningWater::getUserId, userId) + .and(wrapper -> wrapper + .eq(FreightBalanceRunningWater::getUserId, userId) + .or() + .eq(FreightBalanceRunningWater::getAcceptUserId, userId) + ) .lt(Objects.nonNull(lastId), FreightBalanceRunningWater::getId, lastId) .orderByDesc(FreightBalanceRunningWater::getId) .last(PageConstant.DEFAULT_LIMIT)