From 9486766c806fe1d9e082b2fd02ea1cc558f1b443 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 08 五月 2025 09:21:57 +0800
Subject: [PATCH] bug修改
---
cloud-server-other/src/main/java/com/dsh/other/controller/BallController.java | 90 ++++++++++++++++++++++++++++++++------------
1 files changed, 65 insertions(+), 25 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 3343dad..84b2775 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
@@ -1,5 +1,6 @@
package com.dsh.other.controller;
+import com.alibaba.nacos.api.config.filter.IFilterConfig;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.other.entity.*;
import com.dsh.other.feignclient.model.AdvertisementChangeStateDTO;
@@ -12,10 +13,12 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.models.auth.In;
+import org.omg.CORBA.PUBLIC_MEMBER;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.print.DocFlavor;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -33,6 +36,8 @@
private GameService gameService;
@Autowired
private TGameRecordService gameRecordService;
+ @Autowired
+ private ISiteService siteService;
// 数据统计
@ResponseBody
@@ -43,16 +48,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;
}
}
@@ -60,22 +71,24 @@
@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){
+ 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){
+ if (gamesId.size() == 0) {
return new ArrayList<>();
- }else{
+ } else {
// 根据游戏id获取游戏记录 获取用户Ids
- List<Integer> userId = gameRecordService.list(new QueryWrapper<TGameRecord>().in("gameId", gamesId))
+ List<Integer> userId = gameRecordService.list(new QueryWrapper<TGameRecord>().in("gameId", gamesId)
+ .eq("status",1))
.stream().map(TGameRecord::getUserId).collect(Collectors.toList());
return userId;
}
@@ -88,10 +101,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());
@@ -103,37 +116,64 @@
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("/getSiteList")
+ // 查询未配置智慧球场的场地 智慧球场添加使用
+ public List<Site> getSiteList(@RequestParam("storeId") Integer storeId){
+ List<Integer> collect = gameService.list().stream().map(Game::getSiteId).collect(Collectors.toList());
+ if (collect.size() == 0 ){
+ collect.add(-1);
+ }
+ List<Site> list = siteService.list(new QueryWrapper<Site>().select("id","name")
+ .eq("storeId", storeId)
+ .eq("state", 1)
+ .notIn("id",collect)
+ );
+ return list;
+ }
+ // 查询未配置智慧球场的场地 包含当前配置的场地 智慧球场编辑使用
+ @ResponseBody
+ @PostMapping("/getSiteList1")
+ public List<Site> getSiteList1(@RequestParam Integer id) {
+ Game game = gameService.getById(id);
+ List<Integer> collect = gameService.list().stream().map(Game::getSiteId).collect(Collectors.toList());
+ Site byId = siteService.getById(game.getSiteId());
+ List<Site> list = siteService.list(new QueryWrapper<Site>().select("id","name")
+ .eq("state", 1)
+ .eq("storeId",game.getStoreId())
+ .notIn("id",collect)
+ );
+ list.add(byId);
+ return list;
+ }
@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