From acad524bfb7f376c09ff8e6600fab207780156e1 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 23 十一月 2023 18:46:05 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

---
 cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 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 3d0af7d..9bdf0b2 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
@@ -186,10 +186,14 @@
 //        integers.add(2);
         integers.add(3);
 
+        ArrayList<Integer> pays = new ArrayList<>();
+        pays.add(2);
+        pays.add(3);
+
         return paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>()
                 .in("payType",integers)
                 .eq("appUserId",appUserId)
-                .eq("payStatus",2));
+                .in("payStatus",pays));
     }
 
 

--
Gitblit v1.7.1