From 6f31116422d869a7548d09cc2cff965b7cfc0627 Mon Sep 17 00:00:00 2001
From: lingling <1077478963@qq.com>
Date: Sun, 16 Mar 2025 12:03:52 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9C=A8=20WithdrawController=20?=
 =?UTF-8?q?=E4=B8=AD=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7=E9=93=B6=E8=A1=8C?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=8C=E4=BC=98=E5=8C=96=E6=8F=90=E7=8E=B0?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/WithdrawController.php |  9 ++++++---
 app/model/Withdraw.php                    | 17 +++++------------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/app/controller/api/WithdrawController.php b/app/controller/api/WithdrawController.php
index ee3f9fc..e28ab06 100644
--- a/app/controller/api/WithdrawController.php
+++ b/app/controller/api/WithdrawController.php
@@ -132,7 +132,7 @@ class WithdrawController
         //提现金额
         $rate = ExchangeRate::where('type', 'BDT')->first();
         $money = (int)$money_no / 100 * $rate->points;
-
+        $userbank = Userbank::where('id', $bank_id)->first();
         $withdraw = Withdraw::create([
             'user_id' => $user_id,
             'amount' => $money,
@@ -141,7 +141,10 @@ class WithdrawController
             'username' => $user->username,
             'status_text' => '申请中',
             'accumulated'=>$money_no,
-            'fee'=>0
+            'fee'=>self::$handlingFee,
+            'account'=>$userbank->account,
+            'bank_name'=>$userbank->bank_name,
+            'bank_username'=>$userbank->bank_username
         ]);
         //大于1000积分等待管理员审核
         if ($money_no >= 100000) {
@@ -152,7 +155,7 @@ class WithdrawController
 
         //用户积分减少$money
         UserRewardDao::base($user_id, 1, - ($money_no + self::$handlingFee), '提现');
-        $userbank = Userbank::where('id', $bank_id)->first();
+       
         //获取刚刚存入数据库的id(订单号)
         $orderId = $withdraw->id;
         $res = PaymentNew::pushMoney($money, $userbank->bank_username, $userbank->account, $userbank->bank_name, $orderId);
diff --git a/app/model/Withdraw.php b/app/model/Withdraw.php
index 67dbb50..1e9064d 100644
--- a/app/model/Withdraw.php
+++ b/app/model/Withdraw.php
@@ -3,6 +3,7 @@
 namespace app\model;
 
 use support\Model;
+
 /**
  * @property integer $id          VIP级别的唯一标识符
  * @property integer $user_id         用户id
@@ -12,6 +13,9 @@ use support\Model;
  * @property integer $createtime  创建时间（时间戳）
  * @property integer $accumulated 提现积分
  * @property integer $fee 提现手续费
+ * @property string $account 	提现银行账户
+ * @property string $bank_name 	提现银行
+ * @property string $bank_username 提现银行用户名
  */
 class Withdraw extends Model
 {
@@ -29,18 +33,7 @@ class Withdraw extends Model
      */
     protected $primaryKey = 'id';
 
-    
+
     // public $timestamps = false;
 
-    protected $fillable = [
-        'user_id',
-        'amount',
-        'status',
-        'createtime2',
-        'username',
-        'status_text',
-        'order_number',
-        'accumulated',
-        'fee'
-    ];
 }