From 1b9a01bf5000714b08a75a50dd1f5f3eab65d888 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 08 十二月 2023 17:18:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/CompetitionClient.java |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/CompetitionClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/CompetitionClient.java
index 6d5921a..183c22e 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/CompetitionClient.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/CompetitionClient.java
@@ -15,6 +15,13 @@
 @FeignClient("mb-cloud-competition")
 public interface CompetitionClient {
 
+
+
+    /**
+     * 根据门店ids 获取对应的赛事 根据赛事支付记录获取用户ids
+     */
+    @PostMapping("/base/competition/getUserIds")
+    List<Integer> getUserIds(@RequestBody ListQuery query);
     /**
      * 获取赛事报名记录
      */
@@ -37,6 +44,11 @@
     @PostMapping("/base/competition/getPeopleFromId")
     Page<CompetitionUser> getPeopleFromId(GetPeopleQuery getPeopleQuery);
 
+
+    @PostMapping("/base/competition/getPeopleFromId1")
+    List<CompetitionUser> getPeopleFromId1(@RequestBody GetPeopleQuery getPeopleQuery);
+    @PostMapping("/base/competition/getPeoples")
+    List<CompetitionUser> getPeoples(@RequestBody GetPeopleQuery getPeopleQuery);
     @PostMapping("/base/competition/listUser")
     Page<CompetitionUser> listUser(CompetitionUserQuery competitionUserQuery);
 
@@ -48,6 +60,8 @@
 
     @PostMapping("/base/competition/actPt")
     HashMap<String, Object> actPt(List<Integer> ids);
+    @PostMapping("/base/competition/actYys")
+    HashMap<String, Object> actYys(@RequestBody CompetionVO vo);
 
 
 }

--
Gitblit v1.7.1