From 3f358bb8185fb02e9d73eeff9e2cfa537a8f6629 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Thu, 5 Dec 2019 17:29:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7=E5=88=97?=
 =?UTF-8?q?=E8=A1=A82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/MemberController.class.php     | 34 +++++++++++++------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php
index d35a8e86d..174a0cf8d 100644
--- a/Application/Admin/Controller/MemberController.class.php
+++ b/Application/Admin/Controller/MemberController.class.php
@@ -65,7 +65,11 @@ class MemberController extends ThinkController
         if (isset($_REQUEST['viplevel'])) {
             $havs = get_vip_level_limit('recharge_total', $_REQUEST['viplevel']);
         }
+        //与游戏相关
+        $game = false;
 
+
+        //计算用户列表
         $data =  M("user","tab_")
         ->field("tab_user.id,`device_number`,`age_status`,`account`,`balance`,`gold_coin`,`alipay`,tab_user.promote_id,`register_type`,tab_user.promote_account,`register_time`,`lock_status`,`register_way`,`register_ip`,`login_time`,`check_status`,IFNULL(sum(ss.pay_amount), 0) AS recharge_total")
         ->join("tab_spend AS ss ON ss.user_id = tab_user.id AND ss.pay_status = 1","left")
@@ -78,26 +82,34 @@ class MemberController extends ThinkController
         }
         $data = $data->select();
         
-        // echo($data);die();
-        //计算总数
-        $countsql = M("user","tab_")
+     
+        //计算累计充值总额
+        $history_count = M("user","tab_")
         ->field("IFNULL(sum(ss.pay_amount), 0) AS recharge_total")
         ->join("tab_spend AS ss ON ss.user_id = tab_user.id AND ss.pay_status = 1","left")
-        ->where($map)
-        ->group("tab_user.id");
+        ->where($map);
         if($havs){
             $countsql->having($havs);
         }
- 
-        $countsql = $countsql->select(false);
+        $history_count = $history_count->find()['recharge_total'];
+
+        //计算用户总数
+        $user_count = M("user","tab_")
+        ->field("count(*) user_count")
+        ->where($map);
+        if($havs){
+            $user_count->having($havs);
+        }
+        $user_count = $user_count->find()['user_count'];
+       
         // dump($countsql);die();
 
-        $countres =  M()->table('(' . $countsql . ') as a ')->field("count(*) user_count,sum(recharge_total) recharge_total")->find();
+        // $countres =  M()->table('(' . $countsql . ') as a ')->field("count(*) user_count,sum(recharge_total) recharge_total")->find();
 
-        $this->assign('user_count',$countres['user_count']);
-        $this->assign('now_count', $countres['recharge_total']?:0);
+        $this->assign('user_count',$user_count);
+        $this->assign('now_count', $history_count?:0);
 
-        $page = set_pagination($countres['user_count'], $row);
+        $page = set_pagination($user_count, $row);
         if ($page) {
             $this->assign('_page', $page);
         }