From 276571374e8f0e2be2bdcfc5e8ea4a39af1599bc Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 01 八月 2023 09:42:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 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 a83c0f5..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()));
}
@@ -287,8 +286,8 @@
@ApiOperation(value = "获取已报名赛事列表", tags = {"APP-赛事活动列表"})
@ApiImplicitParams({
@ApiImplicitParam(value = "类型（0=全部，1=未开始，2=进行中，3=已结束，4=已取消）", name = "type", dataType = "int", required = true),
- @ApiImplicitParam(value = "页码，首页1", name = "pageSize", dataType = "int", required = true),
- @ApiImplicitParam(value = "页条数", name = "pageNo", dataType = "int", required = true),
+ @ApiImplicitParam(value = "页条数", name = "pageSize", dataType = "int", required = true),
+ @ApiImplicitParam(value = "页码，首页1", name = "pageNo", dataType = "int", required = true),
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
public ResultUtil<List<CompetitionListVo>> queryMyCompetitionList(Integer type, Integer pageSize, Integer pageNo){
@@ -363,6 +362,7 @@
paymentCompetition.setPayStatus(3);
paymentCompetition.setRefundTime(new Date());
paymentCompetition.setRefundOrderNo(refund_id);
+ paymentCompetition.setAppUserId(null);
paymentCompetitionService.updateById(paymentCompetition);
Competition competition = cttService.getById(paymentCompetition.getCompetitionId());
--
Gitblit v1.7.1