From cdde070e08bcf8e99d7291be0d254c1ff0abb0d0 Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Sat, 15 Jul 2023 15:50:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8F=90=E7=8E=B0=E6=89=8B?=
 =?UTF-8?q?=E7=BB=AD=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/services/user/UserExtractServices.php       | 11 +++++++----
 .../admin/src/pages/finance/userExtract/index.vue     |  7 ++++++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/crmeb/app/services/user/UserExtractServices.php b/crmeb/app/services/user/UserExtractServices.php
index 5bc31d069..1af3c0e45 100644
--- a/crmeb/app/services/user/UserExtractServices.php
+++ b/crmeb/app/services/user/UserExtractServices.php
@@ -462,10 +462,13 @@ class UserExtractServices extends BaseServices
         if ($data['money'] <= 0) {
             throw new ApiException(400664);
         }
+        $data['extract_fee'] = bcmul((string)$data['money'], bcdiv((string)sys_config('withdrawal_fee', '0'), '100', 2), 2);
+        $data['extract_price'] = bcsub((string)$data['money'], $data['extract_fee'], 2);
         $insertData = [
             'uid' => $user['uid'],
             'extract_type' => $data['extract_type'],
-            'extract_price' => $data['money'],
+            'extract_price' => $data['extract_price'],
+            'extract_fee' => $data['extract_fee'],
             'add_time' => time(),
             'balance' => $user['brokerage_price'],
             'status' => 0
@@ -482,12 +485,12 @@ class UserExtractServices extends BaseServices
         if ($data['extract_type'] == 'alipay') {
             $insertData['alipay_code'] = $data['alipay_code'];
             $insertData['qrcode_url'] = $data['qrcode_url'];
-            $mark = '使用支付宝提现' . $insertData['extract_price'] . '元';
+            $mark = '使用支付宝提现' . $insertData['extract_price'] . '元，手续费' . $insertData['extract_fee'] . '元';
         } else if ($data['extract_type'] == 'bank') {
-            $mark = '使用银联卡' . $insertData['bank_code'] . '提现' . $insertData['extract_price'] . '元';
+            $mark = '使用银联卡' . $insertData['bank_code'] . '提现' . $insertData['extract_price'] . '元，手续费' . $insertData['extract_fee'] . '元';
         } else if ($data['extract_type'] == 'weixin') {
             $insertData['qrcode_url'] = $data['qrcode_url'];
-            $mark = '使用微信提现' . $insertData['extract_price'] . '元';
+            $mark = '使用微信提现' . $insertData['extract_price'] . '元，手续费' . $insertData['extract_fee'] . '元';
             if (sys_config('brokerage_type', 0) && $openid) {
                 if ($data['money'] < 1) {
                     throw new ApiException(400665);
diff --git a/template/admin/src/pages/finance/userExtract/index.vue b/template/admin/src/pages/finance/userExtract/index.vue
index f0a69f9e9..82dfc38e9 100644
--- a/template/admin/src/pages/finance/userExtract/index.vue
+++ b/template/admin/src/pages/finance/userExtract/index.vue
@@ -89,11 +89,16 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="提现金额" min-width="130">
+        <el-table-column label="提现金额" min-width="100">
           <template slot-scope="scope">
             <div>{{ scope.row.extract_price }}</div>
           </template>
         </el-table-column>
+        <el-table-column label="提现手续费" min-width="100">
+          <template slot-scope="scope">
+            <div>{{ scope.row.extract_fee }}</div>
+          </template>
+        </el-table-column>
         <el-table-column label="提现方式" min-width="130">
           <template slot-scope="scope">
             <div class="type" v-if="scope.row.extract_type === 'bank'">