commit

app/models/user/UserBill.php

@@ -153,6 +153,7 @@ class UserBill extends BaseModel
         if (!$limit) return [];
         $model = self::where('uid', $uid)->where('category', 'now_money')->order('add_time desc')->where('number', '<>', 0)
             ->field('FROM_UNIXTIME(add_time,"%Y-%m") as time,group_concat(id SEPARATOR ",") ids')->group('time');
+        var_dump($model);
         switch ((int)$type) {
             case 1:
                 $model = $model->where('type', '<>', 'brokerage')->where('pm', 0);
@@ -165,23 +166,18 @@ class UserBill extends BaseModel
                 break;
             case 4:
                 $model = $model->where('type', 'brokerage,extract')->where('pm', 0);
+                var_dump($model);
                 break;
         }
 
         if ($page) $model = $model->page((int)$page, (int)$limit);
-//        $list = ($list = $model->select()) ? $list->toArray() : [];
-        $list = $model->select();
-        if ($list) {
-            $list = $list->toArray();
-        } else {
-            $list = [];
-        }
+        $list = ($list = $model->select()) ? $list->toArray() : [];
         $data = [];
         foreach ($list as $item) {
             var_dump('2.4');
             var_dump($item);
             $value['time'] = $item['time'];
-            $value['list'] = self::where('uid', 'in', $item['ids'])->field('FROM_UNIXTIME(add_time,"%Y-%m-%d %H:%i") as add_time,title,number,pm,status')->order('add_time DESC')->select();
+            $value['list'] = self::where('id', 'in', $item['ids'])->field('FROM_UNIXTIME(add_time,"%Y-%m-%d %H:%i") as add_time,title,number,pm,status')->order('add_time DESC')->select();
             array_push($data, $value);
            var_dump('2.5');
            var_dump($value);