From d09828cdec78a160f4530a8ab245216ed8671c27 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 20 九月 2023 18:43:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-account/src/main/java/com/dsh/account/feignclient/competition/DeductionCompetitionsClient.java |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/competition/DeductionCompetitionsClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/competition/DeductionCompetitionsClient.java
index f8a285f..cf89650 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/competition/DeductionCompetitionsClient.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/competition/DeductionCompetitionsClient.java
@@ -1,18 +1,29 @@
 package com.dsh.account.feignclient.competition;
 
 
+import com.dsh.account.feignclient.competition.model.BillingDataRequestVo;
 import com.dsh.account.feignclient.competition.model.GetStuSourseList;
+import com.dsh.account.feignclient.competition.model.PaymentCompetition;
 import com.dsh.account.feignclient.competition.model.PurchaseRecordVo;
+import com.dsh.account.model.BillingRequest;
+import com.dsh.account.model.BillingRequestVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-import java.util.Date;
 import java.util.List;
 
 @FeignClient(value = "mb-cloud-competition")
 public interface DeductionCompetitionsClient {
     @PostMapping("/base/competition/getCompetitionsDetails")
-    List<PurchaseRecordVo> getStuSourseList(GetStuSourseList getStuSourseList);
+    List<PurchaseRecordVo> getStuSourseList(@RequestBody GetStuSourseList getStuSourseList);
 
+    @PostMapping("/base/competition/getPayedCompetitions")
+    BillingRequestVo getAllCompetitionPayRecord(@RequestBody BillingDataRequestVo requestVo);
+
+    @PostMapping("/base/competition/getCancelOrderOfUserPay")
+    BillingRequestVo getCancelOrderOfUserPayRecord(@RequestBody BillingDataRequestVo appUserId);
+
+    @PostMapping("/base/competition/getPlayPaiFGoldPayRecord")
+    List<PaymentCompetition> getPlayPaiFGoldPayRecord(@RequestBody Integer appUserId);
 }

--
Gitblit v1.7.1