From 1b8ad0cc6a79f84fb32fdffae39742afa964748e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 24 九月 2024 16:09:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-competition/src/main/java/com/dsh/competition/feignclient/DeductionCompetitionsClient.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 1567a97..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
@@ -2,6 +2,8 @@
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;
@@ -16,10 +18,8 @@
@PostMapping("/base/competition/getCompetitionsDetails")
public List<PurchaseRecordVo> getStuSourseList(@RequestBody GetStuSourseList sourseList);
- @PostMapping("/base/competition/getPayedCompetitions")
- List<PaymentCompetition> getAllCompetitionPayRecord(@RequestBody Integer appUserId);
- @PostMapping("/base/competition/getCancelOrderOfUserPay")
- public List<PaymentCompetition> getCancelOrderOfUserPayRecord(@RequestBody Integer appUserId);
+ @PostMapping("/base/competition/getPlayPaiFGoldPayRecord")
+ List<PaymentCompetition> getPlayPaiFGoldPayRecord(@RequestBody Integer appUserId);
}
--
Gitblit v1.7.1