commit

app/api/controller/user/UserExtractController.php

@@ -49,6 +49,7 @@ class UserExtractController
         $extractBank = str_replace("\r\n", "\n", $extractBank);//防止不兼容
         $data['extractBank'] = explode("\n", is_array($extractBank) ? (isset($extractBank[0]) ? $extractBank[0] : $extractBank) : $extractBank);
         $data['minPrice'] = sys_config('user_extract_min_price');//提现最低金额
+        $data['charge'] = SystemConfig::where('menu_name', 'charge')->value('value');
         return app('json')->successful($data);
     }
 

app/models/user/UserBill.php

@@ -155,16 +155,16 @@ 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', 'notIn', 'brokerage,bonus,team,push,sale,jt_push,jt_sale')->where('pm', 0);
+                $model = $model->where('type', 'notIn', 'brokerage,bonus,team,push,sale,jt_push,zt_sale')->where('pm', 0);
                 break;
             case 2:
-                $model = $model->where('type', 'notIn', 'brokerage,bonus,team,push,sale,jt_push,jt_sale')->where('pm', 1);
+                $model = $model->where('type', 'notIn', 'brokerage,bonus,team,push,sale,jt_push,zt_sale')->where('pm', 1);
                 break;
             case 3:
-                $model = $model->where('type', 'in','brokerage,bonus,team,push,sale,jt_push,jt_sale')->where('pm', 1);
+                $model = $model->where('type', 'in','brokerage,bonus,team,push,sale,jt_push,zt_sale')->where('pm', 1);
                 break;
             case 4:
-                $model = $model->where('type', 'in','brokerage,bonus,team,push,sale,jt_push,jt_sale')->where('pm', 0);
+                $model = $model->where('type', 'in','brokerage,bonus,team,push,sale,jt_push,zt_sale')->where('pm', 0);
                 break;
         }
         if ($page) $model = $model->page((int)$page, (int)$limit);
@@ -173,7 +173,7 @@ class UserBill extends BaseModel
         $data['time'] = '';
         foreach ($list as $item) {
             $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['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();
         }
         $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');

app/models/user/UserExtract.php

@@ -7,6 +7,7 @@
 
 namespace app\models\user;
 
+use app\admin\model\system\SystemConfig;
 use crmeb\basic\BaseModel;
 use crmeb\services\workerman\ChannelService;
 use crmeb\traits\ModelTrait;
@@ -69,7 +70,7 @@ class UserExtract extends BaseModel
         $insertData = [
             'uid' => $userInfo['uid'],
             'extract_type' => $data['extract_type'],
-            'extract_price' => $data['money'],
+            'extract_price' => $data['money'] - ($data['money'] * SystemConfig::where('menu_name', 'charge')->value('value')/100),
             'add_time' => time(),
             'balance' => $balance,
             'status' => self::AUDIT_STATUS