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 | 76 ++++++++++++++++++++++++++++++++-----
1 files changed, 65 insertions(+), 11 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 1cde1fc..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
@@ -5,15 +5,15 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dsh.competition.entity.Competition;
+import com.dsh.competition.entity.Participant;
import com.dsh.competition.entity.PaymentCompetition;
import com.dsh.competition.entity.UserCompetition;
-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;
import com.dsh.competition.service.CompetitionService;
+import com.dsh.competition.service.IParticipantService;
import com.dsh.competition.service.IPaymentCompetitionService;
import com.dsh.competition.service.UserCompetitionService;
import com.dsh.competition.util.PayMoneyUtil;
@@ -66,28 +66,33 @@
@Autowired
private IPaymentCompetitionService paymentCompetitionService;
+ @Autowired
+ private IParticipantService participantService;
+
@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()));
}
@@ -215,6 +220,7 @@
PaymentCompetition paymentCompetition = paymentCompetitionService.getOne(new QueryWrapper<PaymentCompetition>().eq("code", code).eq("payType", 1));
if(paymentCompetition.getPayStatus() == 1){
+ paymentCompetition.setAppUserId(null);
paymentCompetition.setPayStatus(2);
paymentCompetition.setPayTime(new Date());
paymentCompetition.setPayOrderNo(transaction_id);
@@ -252,6 +258,7 @@
PaymentCompetition paymentCompetition = paymentCompetitionService.getOne(new QueryWrapper<PaymentCompetition>().eq("code", code).eq("payType", 2));
if(paymentCompetition.getPayStatus() == 1){
+ paymentCompetition.setAppUserId(null);
paymentCompetition.setPayStatus(2);
paymentCompetition.setPayTime(new Date());
paymentCompetition.setPayOrderNo(trade_no);
@@ -279,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){
@@ -355,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());
@@ -415,5 +423,51 @@
return new Page<Competition>();
}
}
+
+
+ @PostMapping("/base/competition/add")
+ public void add(@RequestBody Competition competition){
+ try {
+ cttService.save(competition);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+
+ @PostMapping("/base/competition/update")
+ public void update(@RequestBody Competition competition){
+ try {
+ cttService.updateById(competition);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+
+ @PostMapping("/base/competition/cancel")
+ public void cancel(@RequestBody Integer id){
+ try {
+ Competition byId = cttService.getById(id);
+ byId.setStatus(4);
+ cttService.updateById(byId);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+
+
+// @PostMapping("/base/competition/getPeopleFromId")
+// public Page<Participant> getPeopleFromId(@RequestBody GetPeopleQuery getPeopleQuery){
+// try {
+// Page<Participant> participantPage = new Page<>();
+// LambdaQueryWrapper<Participant> participantLambdaQueryWrapper = new LambdaQueryWrapper<>();
+// if(getPeopleQuery.getState()!=null){
+// participantLambdaQueryWrapper.eq(Participant::getState)
+// }
+// participantService.page()
+// }catch (Exception e){
+// return null;
+// }
+// }
+
}
--
Gitblit v1.7.1