From c560f1a14ae1fc468d90e50e6a32d805295875da Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 01 九月 2025 15:35:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/java/com/dsh/course/feignClient/other/BallClient.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/BallClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/BallClient.java
index 528b5ab..998ea21 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/BallClient.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/BallClient.java
@@ -4,6 +4,7 @@
import com.dsh.course.dto.TStudentDto;
import com.dsh.course.feignClient.other.model.Banner;
import com.dsh.course.feignClient.other.model.GameDataQuery;
+import com.dsh.course.feignClient.other.model.Site;
import com.dsh.course.feignClient.other.model.TGameRecord;
import com.dsh.guns.modular.system.model.*;
import com.dsh.guns.modular.system.model.dto.BallQueryDto;
@@ -21,6 +22,7 @@
// 数据统计
@PostMapping("/student/getData")
+ @ResponseBody
List<TGameRecord> getData(@RequestBody GameDataQuery query);
// 根据门店ids 获取游戏记录
@PostMapping("/game/getGameByStoreIds")
@@ -33,6 +35,13 @@
void saveConfig(@RequestBody List<TGameConfig> gameConfigList);
@PostMapping("/queryGame")
Game queryGame(@RequestParam("id") Integer id);
+ // 查询未配置智慧球场的场地 智慧球场添加使用
+ @PostMapping("/getSiteList")
+ List<Site> getSiteList(@RequestParam("storeId") Integer storeId);
+ // 查询未配置智慧球场的场地 包含当前配置的场地 智慧球场编辑使用
+ @PostMapping("/getSiteList1")
+ List<Site> getSiteList1(@RequestParam("id") Integer id);
+
@PostMapping("/listorder")
List<Map<String, Object>> listorder(@RequestBody BookingQuery bookingQuery);
}
--
Gitblit v1.7.1