From 788b8a0af3fe2e8dd5f7e674b4cae964e058cb2a Mon Sep 17 00:00:00 2001
From: li <fengshao1227@gmail.com>
Date: Wed, 3 Jun 2026 19:31:14 +0800
Subject: [PATCH] =?UTF-8?q?revert+fix:=20=E5=9B=9E=E6=BB=9A=E5=85=85?=
 =?UTF-8?q?=E5=80=BC=E6=89=A3=E8=B4=B9=E6=8A=98=E7=AE=97(=E6=81=A2?=
 =?UTF-8?q?=E5=A4=8D=E5=85=A8=E9=A2=9D=E4=B8=8A=E5=88=86)+=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E6=8F=90=E7=8E=B0=E6=89=8B=E7=BB=AD=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

业务调整:客户不让用户承担手续费,改为客户自行预存代付账户余额(全额上分全额提现)。
1) 回滚 alin_recharge_settle 的代收费率折算,恢复充值全额上分
2) apply_withdraw/apply_withdraw_bank 提现手续费默认值 1→0,取消提现手续费
---
 application/onlinechip/controller/Pcapi.php          | 4 ++--
 application/onlinechip/controller/traits/alinPay.php | 9 ---------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/application/onlinechip/controller/Pcapi.php b/application/onlinechip/controller/Pcapi.php
index 1dea564..6c41cb8 100755
--- a/application/onlinechip/controller/Pcapi.php
+++ b/application/onlinechip/controller/Pcapi.php
@@ -3830,7 +3830,7 @@ class Pcapi extends Controller{
                     $system = Db::name('system')->find();
                     $money = $user['money'];
                     $withdrawMoney = empty($system['withdraw_money']) ? 100 : $system['withdraw_money'];
-                    $withdrawFee = empty($system['withdraw_fee']) ? 1 : $system['withdraw_fee'];
+                    $withdrawFee = empty($system['withdraw_fee']) ? 0 : $system['withdraw_fee'];
 
                     // 计算积分兑换
                     $amountMoney = $withdrawMoney/100*($amount);
@@ -3912,7 +3912,7 @@ class Pcapi extends Controller{
                     $system = Db::name('system')->find();
                     $money = $user['money'];
                     $withdrawMoney = empty($system['withdraw_money']) ? 100 : $system['withdraw_money'];
-                    $withdrawFee = empty($system['withdraw_fee']) ? 1 : $system['withdraw_fee'];
+                    $withdrawFee = empty($system['withdraw_fee']) ? 0 : $system['withdraw_fee'];
 
                     // 计算积分兑换
                     $amountMoney = $withdrawMoney/100*($amount);
diff --git a/application/onlinechip/controller/traits/alinPay.php b/application/onlinechip/controller/traits/alinPay.php
index b4404fa..0c92fb3 100644
--- a/application/onlinechip/controller/traits/alinPay.php
+++ b/application/onlinechip/controller/traits/alinPay.php
@@ -232,15 +232,6 @@ trait alinPay
                 'agent'     => 1,
             ])->lock(true)->find();
 
-            // 代收手续费由客户承担：AlinPay 代收时从平台代付账户扣手续费(回调 real_amount 仍是充值全额)，
-            // 若全额上分会导致代付账户被持续掏空(充100万→账户净收99万→提现100万必差)。
-            // 故按 ALIN_VN 配置的 collection_fee_rate(百分比) 折算上分额，使"客户余额=账户实收"。
-            $alinCfg = json_decode(Db::name('pay_channel')->where('key', 'ALIN_VN')->value('value'), true);
-            $alinFeeRate = isset($alinCfg['collection_fee_rate']) ? floatval($alinCfg['collection_fee_rate']) : 0;
-            if ($alinFeeRate > 0) {
-                $order['money'] = round($order['money'] * (1 - $alinFeeRate / 100), 2);
-            }
-
             if (!$zdl || $zdl['money'] < $order['money']) {
                 Db::rollback();
                 addLogToFile('代收结算失败：代理余额不足 order=' . $orderNo, 'alin_callback_error', 'alin');