irving/peipei-backend
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

fix

Browse Source
This commit is contained in:
hucs
2024-08-02 11:21:25 +08:00
parent 6dea98bf96
commit 6b50f4bdd4
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
play-admin/src/main/java/com/starry/admin/modules/balance/module/vo/PlayBalanceDetailsQueryVo.java
View File

@@ -33,4 +33,6 @@ public class PlayBalanceDetailsQueryVo extends BasePageEntity {
private String userType = "1"; private String userType = "1";
private List<String> operationTime; private List<String> operationTime;
private String userId;
} }

4
play-admin/src/main/java/com/starry/admin/modules/balance/service/impl/PlayBalanceDetailsInfoServiceImpl.java
View File

@@ -74,11 +74,13 @@ public class PlayBalanceDetailsInfoServiceImpl extends ServiceImpl<PlayBalanceDe
if (StrUtil.isNotBlank(vo.getNickname())) { if (StrUtil.isNotBlank(vo.getNickname())) {
lambdaQueryWrapper.like(PlayCustomUserInfoEntity::getNickname, vo.getNickname()); lambdaQueryWrapper.like(PlayCustomUserInfoEntity::getNickname, vo.getNickname());
} }
if (StrUtil.isNotBlank(vo.getUserId())) {
lambdaQueryWrapper.like(PlayBalanceDetailsInfoEntity::getUserId, vo.getUserId());
}
if (!vo.getOperationTime().isEmpty()) { if (!vo.getOperationTime().isEmpty()) {
lambdaQueryWrapper.between(PlayBalanceDetailsInfoEntity::getOperationTime, vo.getOperationTime().get(0), vo.getOperationTime().get(1)); lambdaQueryWrapper.between(PlayBalanceDetailsInfoEntity::getOperationTime, vo.getOperationTime().get(0), vo.getOperationTime().get(1));
} }
lambdaQueryWrapper.orderByDesc(PlayBalanceDetailsInfoEntity::getUserId);
lambdaQueryWrapper.orderByDesc(PlayBalanceDetailsInfoEntity::getOperationTime); lambdaQueryWrapper.orderByDesc(PlayBalanceDetailsInfoEntity::getOperationTime);
return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayBalanceDetailsReturnVo.class, lambdaQueryWrapper); return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayBalanceDetailsReturnVo.class, lambdaQueryWrapper);

2
play-admin/src/main/java/com/starry/admin/modules/custom/service/impl/PlayCustomUserInfoServiceImpl.java
View File

@@ -220,7 +220,7 @@ public class PlayCustomUserInfoServiceImpl extends ServiceImpl<PlayCustomUserInf
IPage<PlayCustomUserReturnVo> page = this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayCustomUserReturnVo.class, lambdaQueryWrapper); IPage<PlayCustomUserReturnVo> page = this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayCustomUserReturnVo.class, lambdaQueryWrapper);
for (PlayCustomUserReturnVo record : page.getRecords()) { for (PlayCustomUserReturnVo record : page.getRecords()) {
List<PlayOrderInfoEntity> orderInfoEntities = playOrderInfoService.customSelectOrderInfoByList(record.getId()); List<PlayOrderInfoEntity> orderInfoEntities = playOrderInfoService.list(Wrappers.lambdaQuery(PlayOrderInfoEntity.class).eq(PlayOrderInfoEntity::getPurchaserBy,record.getId()).in(PlayOrderInfoEntity::getPlaceType, "0","2"));
BigDecimal orderTotalAmount = new BigDecimal("0"); BigDecimal orderTotalAmount = new BigDecimal("0");
for (PlayOrderInfoEntity orderInfoEntity : orderInfoEntities) { for (PlayOrderInfoEntity orderInfoEntity : orderInfoEntities) {
orderTotalAmount = orderTotalAmount.add(orderInfoEntity.getFinalAmount()); orderTotalAmount = orderTotalAmount.add(orderInfoEntity.getFinalAmount());