From e256c793ff69f2c99ea411ec08f109473b5f76d0 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Mon, 22 Apr 2024 16:41:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=9A=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=20-=20=E6=94=AF=E6=8C=81=E5=85=A8=E9=83=A8=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/frontend/modules/member/models/MemberModel.php  |  4 +++-
 .../member/services/MemberReferralService.php       | 13 +++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/frontend/modules/member/models/MemberModel.php b/app/frontend/modules/member/models/MemberModel.php
index c523d6ad..c2691975 100644
--- a/app/frontend/modules/member/models/MemberModel.php
+++ b/app/frontend/modules/member/models/MemberModel.php
@@ -923,7 +923,9 @@ class MemberModel extends Member
 
         //获取一级下级会员ID
         $teamMembersIds = $member->memberChildren()
-            // ->where('level', $relationLevel) // todo：2024-4-22 蚂蟥项目修改  查询全部下级
+            ->when($relationLevel > 0,function($query) use ($relationLevel){
+                $query->where('level', $relationLevel);
+            })
             ->pluck('child_id')
             ->toArray();
 
diff --git a/app/frontend/modules/member/services/MemberReferralService.php b/app/frontend/modules/member/services/MemberReferralService.php
index ea26ab65..b73fd62b 100644
--- a/app/frontend/modules/member/services/MemberReferralService.php
+++ b/app/frontend/modules/member/services/MemberReferralService.php
@@ -61,7 +61,9 @@ class MemberReferralService
 
         //获取一级下级会员ID
         $teamMembersIds = MemberChildren::where('member_id', $this->member_id)
-            // ->where('level', $relationLevel) // todo：2024-4-22 蚂蟥项目修改  查询全部下级
+            ->when($relationLevel > 0,function($query) use ($relationLevel){
+                $query->where('level', $relationLevel);
+            })
             ->pluck('child_id')
             ->toArray();
 
@@ -168,7 +170,7 @@ class MemberReferralService
 
         for ($i = 1; $i <= 2; $i++) {
             $agent_count = MemberChildren::where('member_id', $this->member_id)
-                // ->where('level', $i) // todo：2024-4-22 蚂蟥项目修改  查询全部下级
+                ->where('level', $i)
                 ->count();
 
             $total += $agent_count;
@@ -179,6 +181,13 @@ class MemberReferralService
                 'level_p' => 2,
             ];
         }
+        // todo：2024-4-22 蚂蟥项目修改 增加显示全部
+        $data['level0'] = [
+            'level'   => '全部客户',
+            'total'   => MemberChildren::where('member_id', $this->member_id)->count(),
+            'is_show' => true,
+            'level_p' => 2,
+        ];
 
         $data['total'] = $total;