From 3ef388b922400f979788958d9b2823af4fcd7b07 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 22 八月 2023 09:14:01 +0800
Subject: [PATCH] 2.0 新增

---
 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java |   22 ++++++++++++++++++----
 1 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java
index f8cf708..19170de 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java
@@ -601,7 +601,14 @@
         }
 //        promotionWarpper.setUrl("https://chaoshengdaijia.com/share/driverShare/index.html?inviterId=" + uid);
         promotionWarpper.setUrl(driver1.getReferralCode());
-        int user = appUserService.selectCount(new EntityWrapper<AppUser>().eq("inviterType", 2).eq("inviterId", uid).eq("status", 1));
+        int user =0;
+        List<AppUser> appUsers = appUserService.selectList(new EntityWrapper<AppUser>().eq("inviterType", 2).eq("inviterId", uid).eq("status", 1));
+        for (AppUser appUser : appUsers) {
+            List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("userId", appUser.getId()).eq("state", 109));
+            if(orders.size()>0){
+                user++;
+            }
+        }
         int driver = this.selectCount(new EntityWrapper<Driver>().eq("inviterType", 2).eq("inviterId", uid).eq("approvalStatus", 2).eq("status", 1));
         promotionWarpper.setTotal(user + driver);
         promotionWarpper.setUser(user);
@@ -1120,11 +1127,18 @@
         int orderNum = orderService.selectCount(wrapper);
         map.put("orderNum",orderNum);
         // 有效时长
-        int okTime =  this.baseMapper.getTime(sTime,eTime,uid);
-        map.put("okTime",okTime);
+        Integer okTime =  this.baseMapper.getTime(sTime,eTime,uid);
+        map.put("okTime",okTime==null?0:okTime);
         wrapperOne.eq("inviterType",2);
         wrapperOne.eq("inviterId",uid);
-        int userNum = appUserService.selectCount(wrapperOne);
+        List<AppUser> appUsers = appUserService.selectList(wrapperOne);
+        int userNum=0;
+        for (AppUser appUser : appUsers) {
+            List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("userId", appUser.getId()).eq("state", 109));
+            if(orders.size()>0){
+                userNum++;
+            }
+        }
 
 
         map.put("userNum",userNum);

--
Gitblit v1.7.1