From 9b7d12d6dbfd627e983d3b643b0a8bc7b528d8c1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 14:48:17 +0800
Subject: [PATCH] 合并代码
---
cloud-server-account/src/main/java/com/dsh/account/feignclient/competition/DeductionCompetitionsClient.java | 16 ++++++++++++++--
1 files changed, 14 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 fe9c47e..b75e01d 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,9 +1,12 @@
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;
@@ -15,9 +18,18 @@
@PostMapping("/base/competition/getCompetitionsDetails")
List<PurchaseRecordVo> getStuSourseList(@RequestBody GetStuSourseList getStuSourseList);
+ @PostMapping("/base/competition/getCompetitionsDetails1")
+ List<PurchaseRecordVo> getStuSourseList1(@RequestBody GetStuSourseList getStuSourseList);
+
@PostMapping("/base/competition/getPayedCompetitions")
- List<PaymentCompetition> getAllCompetitionPayRecord(@RequestBody Integer appUserId);
+ BillingRequestVo getAllCompetitionPayRecord(@RequestBody BillingDataRequestVo requestVo);
@PostMapping("/base/competition/getCancelOrderOfUserPay")
- public List<PaymentCompetition> getCancelOrderOfUserPayRecord(@RequestBody Integer appUserId);
+ BillingRequestVo getCancelOrderOfUserPayRecord(@RequestBody BillingDataRequestVo appUserId);
+
+ @PostMapping("/base/competition/getPlayPaiFGoldPayRecord")
+ List<PaymentCompetition> getPlayPaiFGoldPayRecord(@RequestBody Integer appUserId);
+
+ @PostMapping("/base/competition/queryByCode")
+ Integer queryByCode(@RequestBody String code);
}
--
Gitblit v1.7.1