From 0d998afc5dd5a41851e34d8b8b742e4934e6fd62 Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期四, 03 八月 2023 18:04:21 +0800
Subject: [PATCH] 修复app端加入玩湃中课程列表数据字段bug；使用福利的课时详情的记录bug
---
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java | 36 +++++++++++++++++++++---------------
1 files changed, 21 insertions(+), 15 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 8299329..2e5b63f 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
@@ -98,8 +98,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));
}
@@ -118,21 +121,24 @@
.in("payType",integers )
.eq("appUserId", sourseList.getAppUserId())
.eq("state",1));
- 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);
- });
+ 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;
}
--
Gitblit v1.7.1