From 26e2592813b9263124d518d238262910e817d323 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 14 八月 2023 10:13:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-competition/src/main/java/com/dsh/competition/feignclient/DeductionCompetitionsClient.java |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/DeductionCompetitionsClient.java b/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/DeductionCompetitionsClient.java
index 566a010..7e58aea 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/DeductionCompetitionsClient.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/DeductionCompetitionsClient.java
@@ -3,6 +3,7 @@
 
 import com.dsh.competition.entity.PaymentCompetition;
 import com.dsh.competition.feignclient.model.BillingDataRequestVo;
+import com.dsh.competition.feignclient.model.BillingRequest;
 import com.dsh.competition.feignclient.model.GetStuSourseList;
 import com.dsh.competition.feignclient.model.PurchaseRecordVo;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -17,11 +18,6 @@
     @PostMapping("/base/competition/getCompetitionsDetails")
     public List<PurchaseRecordVo> getStuSourseList(@RequestBody GetStuSourseList sourseList);
 
-    @PostMapping("/base/competition/getPayedCompetitions")
-    List<PaymentCompetition> getAllCompetitionPayRecord(@RequestBody BillingDataRequestVo requestVo);
-
-    @PostMapping("/base/competition/getCancelOrderOfUserPay")
-    public List<PaymentCompetition> getCancelOrderOfUserPayRecord(@RequestBody BillingDataRequestVo requestVo);
 
     @PostMapping("/base/competition/getPlayPaiFGoldPayRecord")
     List<PaymentCompetition> getPlayPaiFGoldPayRecord(@RequestBody Integer appUserId);

--
Gitblit v1.7.1