From 640ff18d2d7f4be02ddb7f8f75e899f05545eb98 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 05 二月 2024 11:56:52 +0800
Subject: [PATCH] 更新bug修改
---
cloud-server-other/src/main/java/com/dsh/other/controller/BallController.java | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 100 insertions(+), 6 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 4012ed7..5a5c359 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,12 +5,13 @@
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.model.dto.siteDto.GameDataQuery;
+import com.dsh.other.service.*;
import com.dsh.other.util.ResultUtil;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -18,6 +19,8 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* @author zhibing.pu
@@ -28,23 +31,114 @@
public class BallController {
@Autowired
private GameService gameService;
+ @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查询智慧球场支付记录
+ QueryWrapper<TGameRecord> wrapper = new QueryWrapper<TGameRecord>().eq("status", 1)
+ .ne("payType", 3)
+ .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());
+ 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;
+ }
+ }
+
@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
+ private IRegionService regionService;
@ResponseBody
@PostMapping("/save")
- public void save(@RequestBody Game game){
+ public Integer save(@RequestBody Game game) {
- gameService.save(game);
+
+ if (game.getCityCode() != null) {
+ Region city = regionService.getOne(new QueryWrapper<Region>().eq("code", game.getCityCode()));
+ game.setCity(city.getName());
+
+
+ Region province = regionService.getOne(new QueryWrapper<Region>().eq("code", game.getProvinceCode()));
+ game.setProvince(province.getName());
+
+ }
+
+
+ gameService.saveOrUpdate(game);
+ 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);
+ config.saveOrUpdateBatch(gameConfigList);
+// return game.getId();
+ }
+
+ @ResponseBody
+ @PostMapping("/queryGame")
+ 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);
+ return gameService.orderlist(bookingQuery);
+ }
+
}
--
Gitblit v1.7.1