Weenier 168otc项目部署 0630

app/Http/Controllers/Admin/PaymentController.php

@@ -37,7 +37,7 @@ class PaymentController extends Backend
     public function index()
     {
         $type = request()->get('type', 1);
-        $pageSize = request()->get('limit', 99);
+        $pageSize = request()->get('limit', 999);
         $list = $this->service->getOptionList($this->userInfo['user_id'], $type, $pageSize);
         $message = array(
             "msg" => '操作成功',

app/Services/Common/MemberPaymentService.php

@@ -57,16 +57,10 @@ class MemberPaymentService extends BaseService
      * @param $userId
      * @return mixed
      */
-    public function getOptionList($userId, $type = 1, $pageSize = 15)
+    public function getOptionList($userId, $type = 1, $pageSize = 9999)
     {
-        $pageSize = $type==1? 0 : $pageSize;
         $list = $this->model->where(function ($query) use ($userId, $type) {
-                if ($type == 1) {
-                    $query->where(['user_id' => $userId, 'status' => 1,'mark'=>1])->whereRaw('(trade_num<=0 or trade_quota <= 0 or (trade_num-used_num>0 and trade_quota-used_quota>0))');
-
-                } else {
-                    $query->where(['user_id' => $userId,'mark'=>1])->where('status','>',0);
-                }
+            $query->where(['user_id' => $userId,'type'=> $type,'mark'=>1])->where('status','>',0);
             })
             ->selectRaw('id,type,real_name,logo,bank_name,branch_name,account,is_default,bank_card,trade_num,used_num,trade_quota,used_quota,(trade_quota - used_quota) as credit,status')
             ->paginate($pageSize>0? $pageSize : 9999999);