commit

app/api/controller/auction/AuctionController.php

@@ -129,7 +129,14 @@ class AuctionController
         return app('json')->successful('可进入');
     }
 
-
+    /**
+     * 价格区间
+     * @param Request $request
+     * @return mixed
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
     public function section(Request $request)
     {
         $data = UtilService::getMore([
@@ -143,5 +150,123 @@ class AuctionController
         return app('json')->successful($list);
     }
 
+    /**
+     * 添加收款方式
+     * @param Request $request
+     * @return void
+     */
+    public function pay(Request $request)
+    {
+        $data = UtilService::postMore([
+            ['payment'],
+            ['image'],
+            ['bank'],
+            ['name'],
+            ['type'],
+            ['phone']
+        ], $request);
+        if (!$data['type'])  return app('json')->fail('数据传入错误');
+        $data['uid'] =$request->uid();
+        $model = new AuctionPay();
+        $pay = $model->where([['uid', '=', $request->uid()], ['type', '=', $data['type']]])->find();
+        $res = Validate::rule([
+            'phone' => 'mobile'
+        ]);
+        $res->message([
+            'phone.mobile' => '请填写正确手机格式'
+        ]);
+        if (!$res->check($data)){
+            return app('json')->fail($res->getError());
+        }
+        if (!empty($pay)){
+            if ($data['type'] == 1 ){
+                // 微信收款方式
+                if (!$data['payment'])  return app('json')->fail('微信账号不能为空');
+                if (!$data['image'])  return app('json')->fail('二维码不能为空');
+                if (!$data['name'])  return app('json')->fail('姓名不能为空');
+                if (!$data['phone'])  return app('json')->fail('请填写手机号');
+                $pay['payment'] = $data['payment'];
+                $pay['image'] = $data['image'];
+                $pay['name'] = $data['name'];
+                $pay['name'] = $data['name'];
+            }elseif ($data['type'] == 2){
+                // 支付宝收款方式
+                if (!$data['payment'])  return app('json')->fail('支付宝账号不能为空');
+                if (!$data['name'])  return app('json')->fail('姓名不能为空');
+                if (!$data['phone'])  return app('json')->fail('请填写手机号');
+                $pay['payment'] = $data['payment'];
+                $pay['name'] = $data['name'];
+                $pay['name'] = $data['name'];
+            }elseif ($data['type'] == 3){
+                // 银行卡收款方式
+                if (!$data['payment'])  return app('json')->fail('银行卡号不能为空');
+                if (!$data['name'])  return app('json')->fail('姓名不能为空');
+                if (!$data['bank'])  return app('json')->fail('开户行');
+                if (!$data['phone'])  return app('json')->fail('请填写手机号');
+                $pay['payment'] = $data['payment'];
+                $pay['image'] = $data['image'];
+                $pay['bank'] = $data['name'];
+                $pay['phone'] = $data['phone'];
+
+            }
+            $res = $pay->save();
+            if ($res) return app('json')->successful('修改成功');
+            return app('json')->fail('修改失败');
+        }else{
+            if ($data['type'] == 1 ){
+                // 微信收款方式
+                if (!$data['payment'])  return app('json')->fail('微信账号不能为空');
+                if (!$data['image'])  return app('json')->fail('二维码不能为空');
+                if (!$data['name'])  return app('json')->fail('姓名不能为空');
+                if (!$data['phone'])  return app('json')->fail('请填写手机号');
+
+            }elseif ($data['type'] == 2){
+                // 支付宝收款方式
+                if (!$data['payment'])  return app('json')->fail('支付宝账号不能为空');
+                if (!$data['name'])  return app('json')->fail('姓名不能为空');
+                if (!$data['phone'])  return app('json')->fail('请填写手机号');
+
+            }elseif ($data['type'] == 3){
+                // 银行卡收款方式
+                if (!$data['payment'])  return app('json')->fail('银行卡号不能为空');
+                if (!$data['name'])  return app('json')->fail('姓名不能为空');
+                if (!$data['bank'])  return app('json')->fail('开户行不能为空');
+                if (!$data['phone'])  return app('json')->fail('请填写手机号');
+            }
+            $res = $model->save($data);
+            if ($res) return app('json')->successful('添加成功');
+            return app('json')->fail('添加失败');
+        }
+    }
+
+    /**
+     * 收款方式详情
+     * @param Request $request
+     * @return mixed
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    public function pay_list(Request $request)
+    {
+        $model = new AuctionPay();
+        $list = $model->where('uid', $request->uid())->select();
+
+        $list = empty($list)? []: $list->toArray();
+        $data['wx'] = [];
+        $data['zfb'] = [];
+        $data['bank'] = [];
+        foreach ($list as $k => $v){
+            if ($v['type'] == 1){
+                $data['wx'] = $v;
+            }elseif ($v['type'] == 2){
+                $data['zfb'] = $v;
+            }elseif ($v['type'] == 3){
+                $data['bank'] = $v;
+            }
+        }
+        return app('json')->successful($data);
+    }
+
 
 }

app/api/controller/user/UserExtractController.php

@@ -42,7 +42,7 @@ class UserExtractController
         if ($data['broken_commission'] < 0)
             $data['broken_commission'] = 0;
 //        return $data;
-        $data['brokerage_price'] = $user['brokerage_price'];
+        $data['brokerage_price'] = $user['now_money'];
         //可提现佣金
         $data['commissionCount'] = $data['brokerage_price'] - $data['broken_commission'];
         $extractBank = sys_config('user_extract_bank') ?? []; //提现银行
@@ -90,10 +90,10 @@ class UserExtractController
         $data['broken_commission'] = bcsub($brokerage_commission, $refund_commission, 2);
         if ($data['broken_commission'] < 0)
             $data['broken_commission'] = 0;
-        $data['brokerage_price'] = $user['brokerage_price'];
+        $data['brokerage_price'] = $user['now_money'];
         //可提现佣金
         $commissionCount = $data['brokerage_price'] - $data['broken_commission'];
-        if ($extractInfo['money'] > $commissionCount) return app('json')->fail('可提现佣金不足');
+        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/auction/AuctionPay.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace app\models\auction;
+
+use app\models\store\StoreProduct;
+use crmeb\services\SystemConfigService;
+use think\facade\Db;
+use crmeb\traits\ModelTrait;
+use crmeb\basic\BaseModel;
+
+/**
+ * TODO 场馆model
+ * Class Article
+ * @package app\models\article
+ */
+class AuctionPay extends BaseModel
+{
+    /**
+     * 数据表主键
+     * @var string
+     */
+    protected $pk = 'id';
+
+    /**
+     * 模型名称
+     * @var string
+     */
+    protected $name = 'auction_pay';
+
+    use ModelTrait;
+    protected $autoWriteTimestamp = true;
+
+
+}

app/models/user/UserExtract.php

@@ -60,11 +60,11 @@ class UserExtract extends BaseModel
         if(!in_array($data['extract_type'],self::$extractType))
             return self::setErrorInfo('提现方式不存在');
         $userInfo = User::get($userInfo['uid']);
-        $extractPrice = $userInfo['brokerage_price'];
-        if($extractPrice < 0) return self::setErrorInfo('提现佣金不足'.$data['money']);
-        if($data['money'] > $extractPrice) return self::setErrorInfo('提现佣金不足'.$data['money']);
-        if($data['money'] <= 0) return self::setErrorInfo('提现佣金大于0');
-        $balance = bcsub($userInfo['brokerage_price'],$data['money'],2);
+        $extractPrice = $userInfo['now_money'];
+        if($extractPrice < 0) return self::setErrorInfo('提现余额不足'.$data['money']);
+        if($data['money'] > $extractPrice) return self::setErrorInfo('提现余额不足'.$data['money']);
+        if($data['money'] <= 0) return self::setErrorInfo('提现余额大于0');
+        $balance = bcsub($userInfo['now_money'],$data['money'],2);
         if($balance < 0) $balance=0;
         $insertData = [
             'uid' => $userInfo['uid'],
@@ -98,7 +98,7 @@ class UserExtract extends BaseModel
         try{
             $res1 = self::create($insertData);
             if(!$res1) return self::setErrorInfo('提现失败');
-            $res2 = User::edit(['brokerage_price'=>$balance],$userInfo['uid'],'uid');
+            $res2 = User::edit(['now_money'=>$balance],$userInfo['uid'],'uid');
             $res3 = UserBill::expend('余额提现',$userInfo['uid'],'now_money','extract',$data['money'],$res1['id'],$balance,$mark);
             $res = $res2 && $res3;
             if($res){

route/api/route.php

@@ -182,6 +182,9 @@ Route::group(function () {
     Route::post('hanging_sale', 'auction.AuctionProductController/hanging_sale')->name('hanging_sale');//挂售商品
     Route::get('gsxq', 'auction.AuctionProductController/gsxq')->name('gsxq');//挂售详情
 
+    Route::post('auction/pay', 'auction.auctionController/pay')->name('pay');// 添加收款方式
+    Route::get('auction/pay_list', 'auction.auctionController/pay_list')->name('pay_list');// 用户收款方式
+
 
 })->middleware(\app\http\middleware\AllowOriginMiddleware::class)->middleware(\app\http\middleware\AuthTokenMiddleware::class, true);
 //未授权接口