From 1f9d05fd255fbd21356dad37527c7d33fda4fb8b Mon Sep 17 00:00:00 2001 From: liujie <liujie> Date: 星期五, 04 八月 2023 17:03:42 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- cloud-server-competition/src/main/java/com/dsh/competition/feignclient/DeductionCompetitionsClient.java | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 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 3a92b86..566a010 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,21 +1,29 @@ package com.dsh.competition.feignclient; +import com.dsh.competition.entity.PaymentCompetition; +import com.dsh.competition.feignclient.model.BillingDataRequestVo; +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.RequestBody; -import org.springframework.web.bind.annotation.RequestParam; -import java.util.Date; import java.util.List; @FeignClient(value = "mb-cloud-competition") public interface DeductionCompetitionsClient { - @PostMapping("/competition/getCompetitionsDetails") - public List<PurchaseRecordVo> getStuSourseList(@RequestBody Date startTime, - @RequestBody Date endTime, - @RequestParam("appUserId") Integer appUserId); + @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