From f147a6ae7f543f6db757b3933adaf8f10b896ccf Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 20 一月 2025 19:23:17 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/java/com/dsh/course/feignClient/other/BallClient.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 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 411ff7c..663fd5d 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
@@ -3,15 +3,15 @@
import com.dsh.course.dto.StudentSearch;
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;
import com.dsh.guns.modular.system.model.dto.BookingQuery;
import io.swagger.models.auth.In;
import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
@@ -20,6 +20,12 @@
@FeignClient(value = "mb-cloud-other")
public interface BallClient {
+ // 数据统计
+ @PostMapping("/student/getData")
+ List<TGameRecord> getData(@RequestBody GameDataQuery query);
+ // 根据门店ids 获取游戏记录
+ @PostMapping("/game/getGameByStoreIds")
+ List<Integer> getGameByStoreIds(@RequestBody List<Integer> storeIds);
@PostMapping("/student/webStudentList")
List<Game> list(@RequestBody BallQueryDto ballQueryDto);
@PostMapping("/save")
@@ -28,6 +34,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