From 2a3d0885c11a73d41fb03c985f0032086cd8fa07 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 08 三月 2024 17:42:58 +0800
Subject: [PATCH] 合并代码
---
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java
index 3fb28d0..506e666 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java
+++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java
@@ -262,7 +262,9 @@
Integer limit = registeredPersonnel.getLimit();
QueryWrapper<WorldCupPayment> queryWrapper = new QueryWrapper<WorldCupPayment>()
.eq("worldCupId", id).eq("state", 1);
- if(status == 1){
+ if(null == status){
+ queryWrapper.in("payStatus", Arrays.asList(2, 3));
+ }else if(status == 1){
queryWrapper.eq("payStatus", 2);
}else{
queryWrapper.eq("payStatus", 3);
@@ -328,4 +330,9 @@
map.put("total", list2.size());
return map;
}
+
+ @Override
+ public int getCount(Integer worldCupId, List<Long> worldCupPaymentId) {
+ return this.baseMapper.getCount(worldCupId, worldCupPaymentId);
+ }
}
--
Gitblit v1.7.1