From fc5fcf753994834a72564944c117d5ec850f268c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 31 七月 2023 19:08:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
index 8b5074a..67a007a 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
@@ -8,10 +8,7 @@
import com.dsh.competition.entity.Participant;
import com.dsh.competition.entity.PaymentCompetition;
import com.dsh.competition.entity.UserCompetition;
-import com.dsh.competition.feignclient.model.GetPeopleQuery;
-import com.dsh.competition.feignclient.model.GetStuSourseList;
-import com.dsh.competition.feignclient.model.ListQuery;
-import com.dsh.competition.feignclient.model.PurchaseRecordVo;
+import com.dsh.competition.feignclient.model.*;
import com.dsh.competition.model.CompetitionInfo;
import com.dsh.competition.model.CompetitionListVo;
import com.dsh.competition.model.PaymentCompetitionVo;
@@ -74,26 +71,28 @@
@PostMapping("/base/competition/getPayedCompetitions")
- public List<PaymentCompetition> getAllCompetitionPayRecord(@RequestBody Integer appUserId){
+ public List<PaymentCompetition> getAllCompetitionPayRecord(@RequestBody BillingDataRequestVo requestVo){
List<Integer> integers = new ArrayList<>();
integers.add(1);
integers.add(2);
return paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>()
.in("payType",integers)
- .eq("appUserId",appUserId)
- .eq("payStatus",2));
+ .eq("appUserId",requestVo.getAppUserId())
+ .eq("payStatus",2)
+ .between("payTime",requestVo.getMonthStart(),requestVo.getMonthEnd()));
}
@PostMapping("/base/competition/getCancelOrderOfUserPay")
- public List<PaymentCompetition> getCancelOrderOfUserPayRecord(@RequestBody Integer appUserId){
+ public List<PaymentCompetition> getCancelOrderOfUserPayRecord(@RequestBody BillingDataRequestVo requestVo){
List<Integer> integers = new ArrayList<>();
integers.add(1);
integers.add(2);
return paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>()
.in("payType",integers)
- .eq("appUserId",appUserId)
- .eq("payStatus",3));
+ .eq("appUserId",requestVo.getAppUserId())
+ .eq("payStatus",3)
+ .between("refundTime",requestVo.getMonthStart(),requestVo.getMonthEnd()));
}
--
Gitblit v1.7.1