From 312cd22230809437aae8462d71d3335e6540f78a Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 12 十二月 2023 08:54:56 +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 |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 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 74a0dd4..21c51fa 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
@@ -884,14 +884,21 @@
         List<Integer> ids = queryDataFee.getIds();
         if (ids.size() == 0) {
             ids.add(-1);
+        }else{
+            List<Competition> list1 = competitionService.list(new QueryWrapper<Competition>().in("storeId", ids).eq("auditStatus", 2).eq("state", 1).ne("status", 4));
+            ids = list1.stream().map(Competition::getId).collect(Collectors.toList());
+            if (ids.size() == 0) {
+                ids.add(-1);
+            }
         }
+
         LambdaQueryWrapper<PaymentCompetition> vipPaymentLambdaQueryWrapper = new LambdaQueryWrapper<>();
         if (ToolUtil.isNotEmpty(data)) {
             String stime = data.split(" - ")[0] + " 00:00:00";
             String etime = data.split(" - ")[1] + " 23:59:59";
             vipPaymentLambdaQueryWrapper.between(PaymentCompetition::getInsertTime, stime, etime);
         }
-        vipPaymentLambdaQueryWrapper.in(PaymentCompetition::getAppUserId, ids);
+        vipPaymentLambdaQueryWrapper.in(PaymentCompetition::getCompetitionId, ids);
         vipPaymentLambdaQueryWrapper.eq(PaymentCompetition::getPayStatus, 2);
         ArrayList<Integer> objects = new ArrayList<>();
         objects.add(1);
@@ -995,7 +1002,7 @@
                 m = "0" + i;
             }
             String s = year + "-" + m;
-            int count = cttService.count(new LambdaQueryWrapper<Competition>().like(Competition::getInsertTime, s).ne(Competition::getOperatorId, operatorId));
+            int count = cttService.count(new LambdaQueryWrapper<Competition>().like(Competition::getInsertTime, s).eq(Competition::getOperatorId, operatorId));
             int count1 = ucttService.count(new LambdaQueryWrapper<UserCompetition>().in(UserCompetition::getAppUserId, vo.getIds()).like(UserCompetition::getInsertTime, s));
             months.add(count);
             monthsUser.add(count1);
@@ -1006,5 +1013,17 @@
         return map;
     }
 
+
+    @ResponseBody
+    @PostMapping("/base/competition/queryAppUserId")
+    public List<Integer> queryAppUserId(@RequestBody List<Integer> storeIds){
+        List<Competition> list = competitionService.list(new QueryWrapper<Competition>().in("storeId", storeIds).eq("auditStatus", 2).eq("state", 1));
+        List<Integer> collect = list.stream().map(Competition::getId).collect(Collectors.toList());
+        if(collect.size() == 0){
+            return new ArrayList<>();
+        }
+        List<PaymentCompetition> list1 = paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>().eq("payStatus", 2).eq("state", 1).in("competitionId", collect));
+        return list1.stream().map(PaymentCompetition::getAppUserId).collect(Collectors.toList());
+    }
 }
 

--
Gitblit v1.7.1