commit

app/api/controller/user/UserExtractController.php

@@ -93,8 +93,8 @@ class UserExtractController
             $data['broken_commission'] = 0;
         $data['brokerage_price'] = $user['brokerage_price'];
         //可提现佣金
-        $commissionCount = $data['brokerage_price'] - $data['broken_commission'];
-        if ($extractInfo['money'] > $commissionCount) return app('json')->fail('可提现佣金不足');
+//        $commissionCount = $data['brokerage_price'] - $data['broken_commission'];
+//        if ($extractInfo['money'] > $commissionCount) return app('json')->fail('可提现佣金不足');
         if (!$extractInfo['cardnum'] == '')
             if (!preg_match('/^([1-9]{1})(\d{14}|\d{18})$/', $extractInfo['cardnum']))
                 return app('json')->fail('银行卡号输入有误');

app/models/user/UserBill.php

@@ -164,7 +164,7 @@ class UserBill extends BaseModel
                 $model = $model->where('type', 'brokerage')->where('pm', 1);
                 break;
             case 4:
-                $model = $model->where('type', 'brokerage')->where('pm', 0);
+                $model = $model->where('type', 'extract')->where('pm', 0);
                 break;
         }
         if ($page) $model = $model->page((int)$page, (int)$limit);
@@ -172,7 +172,7 @@ class UserBill extends BaseModel
         $data = [];
         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();
+            $value['list'] = self::where('id', 'in', $item['ids'])->field('FROM_UNIXTIME(add_time,"%Y-%m-%d %H:%i") as add_time,title,number,pm,mark')->order('add_time DESC')->select();
             array_push($data, $value);
         }
         return $data;