From f7e51fc7c91e474e5c0bcc79c47f074c0a59b5c3 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 11 十月 2023 20:03:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/CompetitionClient.java |   37 +++++++++++++++++++++++++++++++++++--
 1 files changed, 35 insertions(+), 2 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 51a63b6..6d5921a 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
@@ -1,22 +1,55 @@
 package com.dsh.course.feignClient.competition;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.course.feignClient.competition.model.Competition;
-import com.dsh.course.feignClient.competition.model.ListQuery;
+import com.dsh.course.feignClient.account.model.QueryDataFee;
+import com.dsh.course.feignClient.competition.model.*;
 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.ResponseBody;
 
+import java.util.HashMap;
 import java.util.List;
 
 @FeignClient("mb-cloud-competition")
 public interface CompetitionClient {
 
+    /**
+     * 获取赛事报名记录
+     */
+    @RequestMapping("/base/competition/listAllPayment")
+    List<PaymentCompetition> listAllPayment(@RequestBody CompetitionQuery query);
     @PostMapping("/base/competition/queryById")
     Competition queryById(Integer id);
 
     @PostMapping("/base/competition/list")
     Page<Competition> list(ListQuery listQuery);
+
+    @PostMapping("/base/competition/add")
+    void add(Competition competition);
+
+    @PostMapping("/base/competition/update")
+    void update(Competition competition);
+
+    @PostMapping("/base/competition/cancel")
+    void cancel(Integer id);
+    @PostMapping("/base/competition/getPeopleFromId")
+    Page<CompetitionUser> getPeopleFromId(GetPeopleQuery getPeopleQuery);
+
+    @PostMapping("/base/competition/listUser")
+    Page<CompetitionUser> listUser(CompetitionUserQuery competitionUserQuery);
+
+    @PostMapping("/base/competition/listAudit")
+    Page<Competition> listAudit(ListQuery listQuery);
+
+    @PostMapping("/base/competition/queryFee")
+    Double queryFee(QueryDataFee queryDataFee);
+
+    @PostMapping("/base/competition/actPt")
+    HashMap<String, Object> actPt(List<Integer> ids);
+
+
 }
 
 

--
Gitblit v1.7.1