hy/aslan-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "查询逻辑更改"

Browse Source 
This reverts commit 70742b33621e12f0c69243c45250d41cd38c373e.
This commit is contained in:
tianfeng 2025-12-05 20:41:44 +08:00
parent 60c396354a
commit 2f9c6c19ab
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rc-service/rc-service-wallet/wallet-infrastructure/src/main/java/com/red/circle/wallet/infra/database/rds/service/freight/impl/FreightBalanceRunningWaterServiceImpl.java
View File

@ -39,9 +39,16 @@ public class FreightBalanceRunningWaterServiceImpl extends
@Override @Override
public List<FreightBalanceRunningWater> flowByUserId(Long userId, Long acceptUserId, Integer type, Long lastId) { public List<FreightBalanceRunningWater> flowByUserId(Long userId, Long acceptUserId, Integer type, Long lastId) {
return query() return query()
.eq(FreightBalanceRunningWater::getUserId, userId) .and(Objects.isNull(acceptUserId), wrapper -> wrapper
.eq(Objects.nonNull(acceptUserId), FreightBalanceRunningWater::getAcceptUserId, acceptUserId) .eq(FreightBalanceRunningWater::getUserId, userId)
.eq(Objects.nonNull(type), FreightBalanceRunningWater::getType, type) .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) .lt(Objects.nonNull(lastId), FreightBalanceRunningWater::getId, lastId)
.orderByDesc(FreightBalanceRunningWater::getId) .orderByDesc(FreightBalanceRunningWater::getId)
.last(PageConstant.DEFAULT_LIMIT) .last(PageConstant.DEFAULT_LIMIT)