From a1d261d6c92c38d9e496e11d1bc224ecc1d34798 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期二, 14 十一月 2023 09:14:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-competition/src/main/java/com/dsh/competition/feignclient/DeductionCompetitionsClient.java | 15 ++++++++++-----
1 files changed, 10 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 98d9b2a..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
@@ -1,20 +1,25 @@
package com.dsh.competition.feignclient;
+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;
import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+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")
- public List<PurchaseRecordVo> getStuSourseList(@RequestParam("startTime") Date startTime,
- @RequestParam("endTime") Date endTime,
- @RequestParam("appUserId") Integer appUserId);
+ public List<PurchaseRecordVo> getStuSourseList(@RequestBody GetStuSourseList sourseList);
+
+
+ @PostMapping("/base/competition/getPlayPaiFGoldPayRecord")
+ List<PaymentCompetition> getPlayPaiFGoldPayRecord(@RequestBody Integer appUserId);
}
--
Gitblit v1.7.1