From a4497ecba195a1ac4a81fbbd2a541a7f109609de Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期五, 04 八月 2023 17:03:34 +0800
Subject: [PATCH] 后台代码 --赛事模块
---
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java | 83 +++++++++++++++++++++++++----------------
1 files changed, 50 insertions(+), 33 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 67a007a..4e90260 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,6 +8,8 @@
import com.dsh.competition.entity.Participant;
import com.dsh.competition.entity.PaymentCompetition;
import com.dsh.competition.entity.UserCompetition;
+import com.dsh.competition.feignclient.account.AppUserClient;
+import com.dsh.competition.feignclient.account.model.AppUser;
import com.dsh.competition.feignclient.model.*;
import com.dsh.competition.model.CompetitionInfo;
import com.dsh.competition.model.CompetitionListVo;
@@ -69,6 +71,9 @@
@Autowired
private IParticipantService participantService;
+ @Autowired
+ private AppUserClient appUserClient;
+
@PostMapping("/base/competition/getPayedCompetitions")
public List<PaymentCompetition> getAllCompetitionPayRecord(@RequestBody BillingDataRequestVo requestVo){
@@ -98,8 +103,11 @@
@PostMapping("/base/competition/getPlayPaiFGoldPayRecord")
public List<PaymentCompetition> getPlayPaiFGoldPayRecord(@RequestBody Integer appUserId){
+ ArrayList<Integer> integers = new ArrayList<>();
+ integers.add(1);
+ integers.add(2);
return paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>()
- .eq("payType",3)
+ .in("payType",integers)
.eq("appUserId",appUserId)
.eq("payStatus",3));
}
@@ -111,24 +119,31 @@
List<PurchaseRecordVo> recordVos = new ArrayList<>();
- List<Competition> list = cttService.list(new QueryWrapper<Competition>()
- .eq("payType",3 )
- .eq("auditStatus",2));
- List<Integer> comIds = list.stream().map(Competition::getId).collect(Collectors.toList());
- List<UserCompetition> userCompetitions = ucttService.list(new QueryWrapper<UserCompetition>()
- .between("insertTime", sourseList.getStartTime(),sourseList.getEndTime() )
- .eq("userId", sourseList.getAppUserId())
- .in("competitionId",comIds ));
- if (userCompetitions.size() > 0){
- userCompetitions.forEach(coms ->{
- PurchaseRecordVo recordVo = new PurchaseRecordVo();
- recordVo.setPurchaseType("报名赛事");
- recordVo.setPurchaseTime(dateFormat.format(coms.getInsertTime()));
- PaymentCompetition paymentCompetition = paymentCompetitionService.getById(coms.getPaymentCompetitionId());
- recordVo.setPurchaseAmount("-"+paymentCompetition.getAmount());
- recordVos.add(recordVo);
- });
+ ArrayList<Integer> integers = new ArrayList<>();
+ integers.add(1);
+ integers.add(2);
+ List<PaymentCompetition> list = paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>()
+ .in("payType",integers )
+ .eq("appUserId", sourseList.getAppUserId())
+ .eq("state",1));
+ if (list.size() > 0){
+ List<Long> comIds = list.stream().map(PaymentCompetition::getId).collect(Collectors.toList());
+ List<UserCompetition> userCompetitions = ucttService.list(new QueryWrapper<UserCompetition>()
+ .between("insertTime", sourseList.getStartTime(),sourseList.getEndTime() )
+ .eq("appUserId", sourseList.getAppUserId())
+ .in("paymentCompetitionId",comIds ));
+ if (userCompetitions.size() > 0){
+ userCompetitions.forEach(coms ->{
+ PurchaseRecordVo recordVo = new PurchaseRecordVo();
+ recordVo.setPurchaseType("报名赛事");
+ recordVo.setPurchaseTime(dateFormat.format(coms.getInsertTime()));
+ PaymentCompetition paymentCompetition = paymentCompetitionService.getById(coms.getPaymentCompetitionId());
+ recordVo.setPurchaseAmount("-"+paymentCompetition.getAmount());
+ recordVos.add(recordVo);
+ });
+ }
}
+
return recordVos;
}
@@ -381,7 +396,7 @@
@PostMapping("/base/competition/queryById")
- public Competition queryById(Integer id){
+ public Competition queryById(@RequestBody Integer id){
try {
return cttService.getById(id);
}catch (Exception e){
@@ -410,12 +425,15 @@
wrapper.lt(Competition::getEndTime,listQuery.getTime().split(" - ")[1]+" 23:59:59");
}
if(ToolUtil.isNotEmpty(listQuery.getState())){
- wrapper.eq(Competition::getState,listQuery.getState());
+ wrapper.eq(Competition::getStatus,listQuery.getState());
}
if(ToolUtil.isNotEmpty(listQuery.getRegisterCondition())){
wrapper.eq(Competition::getRegisterCondition,listQuery.getRegisterCondition());
}
wrapper.in(Competition::getStoreId,listQuery.getIds());
+ wrapper.eq(Competition::getAuditStatus,2);
+ wrapper.orderByDesc(Competition::getInsertTime);
+
Page<Competition> page = cttService.page(competitionPage, wrapper);
return page;
}catch (Exception e){
@@ -428,6 +446,7 @@
@PostMapping("/base/competition/add")
public void add(@RequestBody Competition competition){
try {
+ competition.setInsertTime(new Date());
cttService.save(competition);
}catch (Exception e){
e.printStackTrace();
@@ -455,19 +474,17 @@
}
-// @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;
-// }
-// }
+ @PostMapping("/base/competition/getPeopleFromId")
+ public Page<CompetitionUser> getPeopleFromId(@RequestBody GetPeopleQuery getPeopleQuery){
+ try {
+ Page<UserCompetition> participantPage = new Page<>(getPeopleQuery.getOffset(),getPeopleQuery.getLimit());
+ Page<CompetitionUser> page = participantService.getPeopleFromId(participantPage,getPeopleQuery.getId(),getPeopleQuery.getState());
+ return page;
+ }catch (Exception e){
+ e.printStackTrace();
+ return null;
+ }
+ }
}
--
Gitblit v1.7.1