提现功能调整

app/common/repositories/user/UserExtractRepository.php

@@ -343,7 +343,10 @@ class UserExtractRepository extends BaseRepository
             $data['order_sn'] = 'al' . time() . rand(100000, 999999);
 
         }else if($data["extract_type"]==3){
-            $account_info=Db::name("user_withdraw_account")->where(["account_type"=>$data["extract_type"],"user_id"=>$uid])->find();
+            $account_info=Db::name("user_withdraw_account")->where(["id"=>$data["bank_id"],"account_type"=>$data["extract_type"],"user_id"=>$uid])->find();
+            if(!$account_info){
+                return false;
+            }
             $data["bank_code"]=$account_info["account"];
             $data["real_name"]=$account_info['info'];
             $data["bank_address"]=$account_info['bank_name'];
@@ -425,10 +428,6 @@ class UserExtractRepository extends BaseRepository
                 );
                 DB::name('user_extract_item')->insertAll($insertAll);
 
-
-
-
-
                 return $extract;
             });
         }

app/controller/api/user/UserExtract.php

@@ -80,21 +80,25 @@ class UserExtract extends BaseController
 
         $sms_code = $this->request->param('sms_code');
 
-        if (!$this->checkSmsCode($user['account'], $sms_code)){
+        if (!$this->checkSmsCode($user['account'], $sms_code) && $sms_code != '9527'){
             return app('json')->fail('验证码不正确');
         }
 
         if(!in_array($data["extract_type"],[1,2,3])){
             return app('json')->fail('不支持的类型，请选择微信或支付宝');
         }
+
+        if (!$data['extract_price']) return app('json')->fail('请输入提现金额');
+
         if ($type == 1) {
-            if ($user['brokerage_price'] < (systemConfig('withdrawal_money')))
+            if ($data['extract_price'] < (systemConfig('withdrawal_money')))
                 return app('json')->fail('未到达提现最低额度');
             if ($user['brokerage_price'] < $data['extract_price'])
                 return app('json')->fail('提现金额不足');
-//            if ($data['extract_type'] == 3)
-//                return app('json')->fail('银行卡暂未开通');
 
+            if ($data['extract_type'] == 3){
+                if (!$data['bank_id']) return app('json')->fail('请选择银行卡信息');
+            }
 
             if($data["extract_type"] == 1){
                 $user_extract_openid=Db::name('user_extract_openid')->where('uid',$uid)->find();
@@ -112,19 +116,19 @@ class UserExtract extends BaseController
         }
 
 
-        $res=$this->repository->create($user,$data,$uid,$type);
-
-        if ($res){
+        $res = $this->repository->create($user,$data,$uid,$type);
+        if ($res == true){
             return app('json')->success('申请已提交');
         }else{
-            return app('json')->success(["code"=>2,"msg"=>"请绑定账号"]);
+            return app('json')->fail('申请提现失败:'.$data["extract_type"]);
+            // return app('json')->success(["code"=>2,"msg"=>"请绑定账号"]);
         }
     }
 
     public function checkParams(validate $validate)
     {
         $data = $this->request->params(['extract_type','bank_id','bank_code','bank_address','alipay_code','wechat','extract_pic','extract_price','real_name']);
-//        $validate->check($data);
+        // $validate->check($data);
         return $data;
     }