commit

app/api/controller/user/UserController.php

@@ -902,7 +902,7 @@ class UserController
             ['name', ''],
         ]);
         if ($data['name']){
-            $where[] = ['nickname|uid', '=', $data['name']];
+            $where[] = ['nickname|uid|phone', '=', $data['name']];
         }else{
             $where = [];
         }

app/models/user/UserBill.php

@@ -155,26 +155,28 @@ class UserBill extends BaseModel
             ->field('FROM_UNIXTIME(add_time,"%Y-%m") as time,group_concat(id SEPARATOR ",") ids')->group('time');
         switch ((int)$type) {
             case 1:
-                $model = $model->where('type', '<>', 'brokerage')->where('pm', 0);
+                $model = $model->where('type', 'notIn', 'brokerage,bonus,team,push,sale,jt_push,jt_sale')->where('pm', 0);
                 break;
             case 2:
-                $model = $model->where('type', '<>', 'brokerage')->where('pm', 1);
+                $model = $model->where('type', 'notIn', 'brokerage,bonus,team,push,sale,jt_push,jt_sale')->where('pm', 1);
                 break;
             case 3:
-                $model = $model->where('type', 'brokerage')->where('pm', 1);
+                $model = $model->where('type', 'in','brokerage,bonus,team,push,sale,jt_push,jt_sale')->where('pm', 1);
                 break;
             case 4:
-                $model = $model->where('type', 'brokerage')->where('pm', 0);
+                $model = $model->where('type', 'in','brokerage,bonus,team,push,sale,jt_push,jt_sale')->where('pm', 0);
                 break;
         }
         if ($page) $model = $model->page((int)$page, (int)$limit);
         $list = ($list = $model->select()) ? $list->toArray() : [];
-        $data = [];
+        $data['list'] = [];
+        $data['time'] = '';
         foreach ($list as $item) {
-            $value['time'] = $item['time'];
-            $value['list'] = self::where('id', 'in', $item['ids'])->field('FROM_UNIXTIME(add_time,"%Y-%m-%d %H:%i") as add_time,title,number,pm')->order('add_time DESC')->select();
-            array_push($data, $value);
+            $data['time'] = $item['time'];
+            $data['list'] = self::where('id', 'in', $item['ids'])->field('FROM_UNIXTIME(add_time,"%Y-%m-%d %H:%i") as add_time,title,number,pm')->order('add_time DESC')->select();
         }
+        $data['zc'] = self::where('type', 'extract')->sum('number');
+        $data['sr'] = self::where('type', 'in','brokerage,bonus,team,push,sale,jt_push,jt_sale')->where('uid', $uid)->where('pm', 1)->sum('number');
         return $data;
     }