From cf28c25d1a8e360ab328c5435d289c5cb9b414c1 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期六, 25 十一月 2023 21:06:34 +0800
Subject: [PATCH] 11.26
---
cloud-server-other/src/main/java/com/dsh/other/controller/BallController.java | 54 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 36 insertions(+), 18 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 71585a9..42cccc7 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,10 +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.service.GameService;
-import com.dsh.other.service.IBannerService;
-import com.dsh.other.service.IRegionService;
-import com.dsh.other.service.TGameConfigService;
+import com.dsh.other.service.*;
import com.dsh.other.util.ResultUtil;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -22,6 +19,7 @@
import java.util.Date;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* @author zhibing.pu
@@ -32,12 +30,33 @@
public class BallController {
@Autowired
private GameService gameService;
+ @Autowired
+ private TGameRecordService gameRecordService;
@ResponseBody
@PostMapping("/student/webStudentList")
- public List<Game> list(@RequestBody BallQueryDto ballQueryDto){
- List<Game> games = gameService.queryAll(ballQueryDto);
+ public List<Game> list(@RequestBody BallQueryDto ballQueryDto) {
+ List<Game> games = gameService.queryAll(ballQueryDto);
return games;
+ }
+
+ // 根据门店ids 获取游戏记录
+ @ResponseBody
+ @PostMapping("/game/getGameByStoreIds")
+ public List<Integer> getGameByStoreIds(@RequestBody List<Integer> storeIds) {
+ // 游戏id
+ List<Integer> gamesId = gameService.list(new QueryWrapper<Game>().in("storeId", storeIds))
+ .stream().map(Game::getId).collect(Collectors.toList());
+ if (gamesId.size() == 0) {
+ return new ArrayList<>();
+ } else {
+ // 根据游戏id获取游戏记录 获取用户Ids
+ List<Integer> userId = gameRecordService.list(new QueryWrapper<TGameRecord>().in("gameId", gamesId))
+ .stream().map(TGameRecord::getUserId).collect(Collectors.toList());
+ return userId;
+ }
+
+
}
@Autowired
@@ -45,10 +64,10 @@
@ResponseBody
@PostMapping("/save")
- public Integer save(@RequestBody Game game){
+ public Integer save(@RequestBody Game game) {
- if (game.getCityCode()!=null) {
+ if (game.getCityCode() != null) {
Region city = regionService.getOne(new QueryWrapper<Region>().eq("code", game.getCityCode()));
game.setCity(city.getName());
@@ -60,37 +79,36 @@
gameService.saveOrUpdate(game);
- System.out.println("==========="+game);
- return game.getId();
+ System.out.println("===========" + game);
+ return game.getId();
}
+
@Autowired
private TGameConfigService config;
@ResponseBody
@PostMapping("/saveConfig")
- public void saveConfig(@RequestBody List<TGameConfig> gameConfigList){
- System.out.println("=======gameConfigList===="+gameConfigList);
+ public void saveConfig(@RequestBody List<TGameConfig> gameConfigList) {
+ System.out.println("=======gameConfigList====" + gameConfigList);
config.saveOrUpdateBatch(gameConfigList);
// return game.getId();
}
@ResponseBody
@PostMapping("/queryGame")
- public Game queryGame(@RequestParam Integer id){
- return gameService.getById(id);
+ public Game queryGame(@RequestParam Integer id) {
+ return gameService.getById(id);
// return game.getId();
}
@ResponseBody
@PostMapping("/listorder")
- public List<Map<String, Object>> listorder(@RequestBody BookingQuery bookingQuery){
- System.out.println("===bookingQuery===="+bookingQuery);
+ public List<Map<String, Object>> listorder(@RequestBody BookingQuery bookingQuery) {
+ System.out.println("===bookingQuery====" + bookingQuery);
return gameService.orderlist(bookingQuery);
// return game.getId();
}
-
-
}
--
Gitblit v1.7.1