From a1e80d905fd38f6ead484396b788fe19b0a3d7d5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 08 十二月 2023 09:16:13 +0800
Subject: [PATCH] 修改bug
---
cloud-server-other/src/main/java/com/dsh/other/controller/BallController.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/BallController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/BallController.java
index c8903fd..3a9c4ab 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/BallController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/BallController.java
@@ -43,16 +43,22 @@
List<Integer> gameIds = gameService.list(new QueryWrapper<Game>().eq("operationId", query.getObjectId()))
.stream().map(Game::getId).collect(Collectors.toList());
// 根据游戏ids查询智慧球场支付记录
- List<TGameRecord> list = gameRecordService.list(new QueryWrapper<TGameRecord>().in("gameId", gameIds)
- .eq("status", 1)
+ QueryWrapper<TGameRecord> wrapper = new QueryWrapper<TGameRecord>().eq("status", 1)
.ne("payType", 3)
- .ne("payType", 4));
+ .ne("payType", 4);
+ if(gameIds.size() > 0){
+ wrapper.in("gameId", gameIds);
+ }
+ List<TGameRecord> list = gameRecordService.list(wrapper);
return list;
}else{
List<Integer> gameIds = gameService.list(new QueryWrapper<Game>().eq("storeId", query.getStoreId()))
.stream().map(Game::getId).collect(Collectors.toList());
- List<TGameRecord> list = gameRecordService.list(new QueryWrapper<TGameRecord>().in("gameId", gameIds)
- .eq("status", 1).eq("payType", 1).eq("payType", 2));
+ QueryWrapper wrapper = new QueryWrapper<TGameRecord>().eq("status", 1).eq("payType", 1).eq("payType", 2);
+ if(gameIds.size() > 0){
+ wrapper.in("gameId", gameIds);
+ }
+ List<TGameRecord> list = gameRecordService.list(wrapper);
return list;
}
}
--
Gitblit v1.7.1