1

app/models/user/UserBill.php

@@ -156,16 +156,16 @@ class UserBill extends BaseModel
                 $model = $model->where('type', 'in', 'recharge,brokerage,pay_product,system_add,pay_product_refund,system_sub');
                 break;
             case 1:
-                $model = $model->where('type', 'pay_product');
+                $model = $model->where('type', '<>', 'brokerage')->where('pm', 0);
                 break;
             case 2:
-                $model = $model->where('type', 'in', 'recharge,system_add');
+                $model = $model->where('type', '<>', 'brokerage')->where('pm', 1);
                 break;
             case 3:
-                $model = $model->where('type', 'brokerage')->whereOr('type', 'recharge');
+                $model = $model->where('type', 'brokerage')->where('pm', 1);
                 break;
             case 4:
-                $model = $model->where('type', 'extract')->whereOr('type', 'recharge');
+                $model = $model->where('type', 'brokerage')->where('pm', 0);
                 break;
         }
         if ($page) $model = $model->page((int)$page, (int)$limit);