锁客部分调整

app/controller/merchant/user/User.php

@@ -817,21 +817,24 @@ class User extends BaseController
         $dataQuery = Db::query("SELECT user_group,count(uid) count FROM `rrx_user` where uid in ($chilid_userids_string) group by user_group");
         $dataQuery = array_column($dataQuery, 'count', 'user_group');
         $shopPartnerCount = Db::query("SELECT user_group,count(uid) count FROM `rrx_user` where uid in ($chilid_userids_string) and is_shop_partner=1 group by user_group");
-        $countmoyer[] = ['className' => 'el-icon-s-goods', 'user_group' => 1, 'count' => (int)($dataQuery[1] ?? 0), 'name' => '消费者'];
-        $countmoyer[] = ['className' => 'el-icon-s-goods', 'user_group' => 2, 'count' => (int)($dataQuery[2] ?? 0), 'name' => 'V客'];
-        $countmoyer[] = ['className' => 'el-icon-s-goods', 'user_group' => 3, 'count' => (int)($dataQuery[3] ?? 0), 'name' => '大V经理'];
-        $countmoyer[] = ['className' => 'el-icon-s-goods', 'user_group' => 4, 'count' => (int)($dataQuery[4] ?? 0), 'name' => '创客'];
-        $countmoyer[] = ['className' => 'el-icon-s-goods', 'user_group' => 5, 'count' => (int)($dataQuery[5] ?? 0), 'name' => '区县代理'];
-        $countmoyer[] = ['className' => 'el-icon-s-goods', 'user_group' => 6, 'count' => (int)($dataQuery[6] ?? 0), 'name' => '省级代理'];
+        // $countmoyer[] = ['className' => 'el-icon-s-goods', 'user_group' => 1, 'count' => (int)($dataQuery[1] ?? 0), 'name' => '消费者'];
+        // $countmoyer[] = ['className' => 'el-icon-s-goods', 'user_group' => 2, 'count' => (int)($dataQuery[2] ?? 0), 'name' => 'V客'];
+        // $countmoyer[] = ['className' => 'el-icon-s-goods', 'user_group' => 3, 'count' => (int)($dataQuery[3] ?? 0), 'name' => '大V经理'];
+        // $countmoyer[] = ['className' => 'el-icon-s-goods', 'user_group' => 4, 'count' => (int)($dataQuery[4] ?? 0), 'name' => '创客'];
+        // $countmoyer[] = ['className' => 'el-icon-s-goods', 'user_group' => 5, 'count' => (int)($dataQuery[5] ?? 0), 'name' => '区县代理'];
+        // $countmoyer[] = ['className' => 'el-icon-s-goods', 'user_group' => 6, 'count' => (int)($dataQuery[6] ?? 0), 'name' => '省级代理'];
 //        $countmoyer[] = ['className' => 'el-icon-s-goods', 'count' => (int)($shopPartnerCount), 'name' => '创客合伙人'];
+        $allCount = Db::name('user')->where('mer_id', $mer_id)->count();
+        $countmoyer[] = ['className' => 'el-icon-s-goods', 'count' => (int)($allCount), 'name' => '锁客总数'];
 
         $whereTime = $this->request->params([
             'user_time_type',
             'user_time',
         ]);
         $query =Db::name('user')
-            ->field('uid,nickname,phone,spread_uid,user_group,create_time,is_shop_partner')
-            ->whereIn('uid', $chilid_userids)
+            ->field('uid,nickname,phone,spread_uid,user_group,create_time,is_shop_partner,wechat_user_id,ali_user_id,avatar')
+            // ->whereIn('uid', $chilid_userids)
+            ->where('mer_id', $mer_id)
             ->when($nickname != '',function ($query) use ($nickname){
                 $query->whereLike('nickname',"%".$nickname."%");
             })->when($account != '',function ($query) use ($account){
@@ -870,6 +873,7 @@ class User extends BaseController
                 unset($item['spread_uid']);
                 return $item;
             });;
+
         $date['count'] = $query->count();
         $date['shouyi'] = 0;
         $date['stride_shop_money'] = 0;