From c81d766cd91be3b3a24c8db94dcd93c071a66c62 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期五, 14 七月 2023 09:30:19 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- cloud-server-account/src/main/java/com/dsh/account/feignclient/competition/DeductionCompetitionsClient.java | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 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 829d85d..fc6962a 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,19 +1,26 @@ package com.dsh.account.feignclient.competition; +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 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); + List<PurchaseRecordVo> getStuSourseList(@RequestBody GetStuSourseList getStuSourseList); + @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