From aa45df63fa01b2f010560e4157f00bec5150a1fb Mon Sep 17 00:00:00 2001 From: 44323 <443237572@qq.com> Date: 星期一, 27 十一月 2023 17:08:15 +0800 Subject: [PATCH] 后台bug修改 --- cloud-server-other/src/main/java/com/dsh/other/controller/BallController.java | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 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 979aa00..3343dad 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 @@ -5,6 +5,7 @@ import com.dsh.other.feignclient.model.AdvertisementChangeStateDTO; import com.dsh.other.feignclient.model.AdvertisementQuery; import com.dsh.other.model.BannerVo; +import com.dsh.other.model.dto.siteDto.GameDataQuery; import com.dsh.other.service.*; import com.dsh.other.util.ResultUtil; import io.swagger.annotations.ApiImplicitParam; @@ -33,6 +34,30 @@ @Autowired private TGameRecordService gameRecordService; + // 数据统计 + @ResponseBody + @PostMapping("/student/getData") + public List<TGameRecord> getData(@RequestBody GameDataQuery query){ + if (query.getStoreId()==null){ + // 获取到游戏ids + 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) + .ne("payType", 3) + .ne("payType", 4)); + 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)); + return list; + } + } + + @ResponseBody @PostMapping("/student/webStudentList") public List<Game> list(@RequestBody BallQueryDto ballQueryDto){ -- Gitblit v1.7.1