From 818e8d1810bcdcbeae5a948ecd115ff0ce5a1f54 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 26 七月 2023 17:56:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 54 insertions(+), 0 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..a83c0f5 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,8 +5,10 @@
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.GetPeopleQuery;
import com.dsh.competition.feignclient.model.GetStuSourseList;
import com.dsh.competition.feignclient.model.ListQuery;
import com.dsh.competition.feignclient.model.PurchaseRecordVo;
@@ -14,6 +16,7 @@
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;
@@ -65,6 +68,9 @@
@Autowired
private IPaymentCompetitionService paymentCompetitionService;
+
+ @Autowired
+ private IParticipantService participantService;
@PostMapping("/base/competition/getPayedCompetitions")
@@ -215,6 +221,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 +259,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);
@@ -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