From fd1de9794d227501f777d895017d5d9f00f18e96 Mon Sep 17 00:00:00 2001
From: lingling <1077478963@qq.com>
Date: Fri, 14 Mar 2025 20:38:20 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=20WithdrawController?=
 =?UTF-8?q?=20=E4=B8=AD=E7=A7=AF=E5=88=86=E8=AE=A1=E7=AE=97=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=EF=BC=8C=E4=BD=BF=E7=94=A8=20accumulated=20=E5=92=8C?=
 =?UTF-8?q?=20fee=20=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/admin/api/v1/WithdrawController.php | 7 ++++---
 app/controller/api/WithdrawController.php          | 9 +++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/controller/admin/api/v1/WithdrawController.php b/app/controller/admin/api/v1/WithdrawController.php
index 219bec1..8537fc7 100644
--- a/app/controller/admin/api/v1/WithdrawController.php
+++ b/app/controller/admin/api/v1/WithdrawController.php
@@ -81,10 +81,11 @@ class WithdrawController
         //是否同意转账
         $type = $request->post('type');
 
-        $rate = ExchangeRate::where('type', 'BDT')->get();
-        //计算积分
-        $money = $amount * 100 / $rate[0]['points'] + 300;
         $Withdraw = Withdraw::where('id', $id)->first();
+
+        //计算积分
+        $money = $Withdraw->accumulated + $Withdraw->fee;
+       
         if($Withdraw->status != 1){
             return ApiResponse::error(400,[],'请勿重复点击');
         }
diff --git a/app/controller/api/WithdrawController.php b/app/controller/api/WithdrawController.php
index 9aee095..ee3f9fc 100644
--- a/app/controller/api/WithdrawController.php
+++ b/app/controller/api/WithdrawController.php
@@ -130,8 +130,8 @@ class WithdrawController
             return ApiResponseApp::error(null, '提现频繁请三分钟后再试');
         }
         //提现金额
-        $rate = ExchangeRate::where('type', 'BDT')->get();
-        $money = (int)$money_no / 100 * $rate[0]['points'];
+        $rate = ExchangeRate::where('type', 'BDT')->first();
+        $money = (int)$money_no / 100 * $rate->points;
 
         $withdraw = Withdraw::create([
             'user_id' => $user_id,
@@ -140,6 +140,8 @@ class WithdrawController
             'createtime2' => date('Y-m-d H:i:s'),
             'username' => $user->username,
             'status_text' => '申请中',
+            'accumulated'=>$money_no,
+            'fee'=>0
         ]);
         //大于1000积分等待管理员审核
         if ($money_no >= 100000) {
@@ -224,8 +226,7 @@ class WithdrawController
             if ($withdraw->status == 5) {
                 return;
             }
-            $rate = ExchangeRate::where('type', 'BDT')->get();
-            $money = $amount * 100 / $rate[0]['points'] + 300;
+            $money = $withdraw->accumulated + $withdraw->fee;
             UserRewardDao::base($withdraw->user_id, 1, $money, '提现失败返还');
             $withdraw->update([
                 'status' => 5,