会员账户统计

app/admin/controller/finance/MemberAccountController.php

@@ -70,31 +70,34 @@ class MemberAccountController
                 $query->whereJsonContains('member.member_extend_json->belong->premises', $premisesId);
             })->where('member.member_mobile', '<>', '0000');
 
+        $memberTotalModel = clone $rows;
+        $statistics['memberTotal'] = $memberTotalModel->distinct('ma.join_account_member_id')->count();
+
         $total = $rows->count('member_id');
         $statistics['surplus'] = $rows->sum('ma.member_account_surplus');
         $statistics['income'] = $rows->sum('ma.member_account_income');
         $statistics['expend'] = $rows->sum('member_account_expend');
         $statistics['added'] = $rows->sum('member_account_added');
 
-        $statistics['memberTotal'] = Member::where('member_mobile', '<>', '0000')
-            ->when(!empty($level), function ($query) use ($level, $levelIds) {
-                if ($level == '00') {
-                    $query->where('join_member_role_id', '')->orWhere('join_member_role_id', NULL);
-                } else if ($level == 'VIP') {
-                    $query->where('member_is_vip', 'Y');
-                } else if (!empty($levelIds)) {
-                    $query->whereIn('member_role_id', $levelIds);
-                } else {
-                    $query->where('join_member_role_id', $level);
-                }
-
-            })->when(!empty($memberId), function ($query) use ($memberId) {
-                $query->where('member_id', $memberId);
-            })->when(!empty($days), function ($query) use ($days) {
-                $query->whereBetween('member_addtimes', $days);
-            })->when(!empty($premisesId), function ($query) use ($premisesId) {
-                $query->whereJsonContains('member_extend_json->belong->premises', $premisesId);
-            })->count();
+//        $statistics['memberTotal'] = Member::where('member_mobile', '<>', '0000')
+//            ->when(!empty($level), function ($query) use ($level, $levelIds) {
+//                if ($level == '00') {
+//                    $query->where('join_member_role_id', '')->orWhere('join_member_role_id', NULL);
+//                } else if ($level == 'VIP') {
+//                    $query->where('member_is_vip', 'Y');
+//                } else if (!empty($levelIds)) {
+//                    $query->whereIn('member_role_id', $levelIds);
+//                } else {
+//                    $query->where('join_member_role_id', $level);
+//                }
+//
+//            })->when(!empty($memberId), function ($query) use ($memberId) {
+//                $query->where('member_id', $memberId);
+//            })->when(!empty($days), function ($query) use ($days) {
+//                $query->whereBetween('member_addtimes', $days);
+//            })->when(!empty($premisesId), function ($query) use ($premisesId) {
+//                $query->whereJsonContains('member_extend_json->belong->premises', $premisesId);
+//            })->count();
 
         $rows = $rows->select('member.member_id', 'member.member_mobile', 'member.member_addtimes', 'member.join_member_role_id',
             'ma.member_account_id as member_account_id','ma.member_account_income as member_account_income', 'ma.member_account_expend as member_account_expend', 'ma.member_account_surplus as member_account_surplus', 'ma.member_account_added as member_account_added'