og/Pro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "feat: 线上自助充值不再扣代理余额（系统直充）"

Browse Source 
This reverts commit 0bf387f7d5.
This commit is contained in:
fengshao1227
2026-05-24 20:55:06 +08:00
parent 0bf387f7d5
commit 24c71fa7a0
9 changed files with 106 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/onlinechip/controller/traits/alinPay.php
+11 -6
View File
@@ -73,6 +73,10 @@ trait alinPay
if (!$zdl) {
return json(['status' => 0, 'message' => '所属代理账号异常，暂不能充值']);
}
if ($zdl['money'] < $money) {
return json(['status' => 0, 'message' => '所属代理余额不足，暂不能充值']);
}
$pay_list = config('pay_list');
$pay_orderid = 'E' . date("YmdHis") . rand(100000, 999999);
$notify_url = $pay_list['alinPay']['notify_url'];
@@ -228,9 +232,9 @@ trait alinPay
'agent' => 1,
])->lock(true)->find();
if (!$zdl) {
if (!$zdl || $zdl['money'] < $order['money']) {
Db::rollback();
addLogToFile('代收结算失败：无法找到总代理 order=' . $orderNo, 'alin_callback_error', 'alin');
addLogToFile('代收结算失败：代理余额不足 order=' . $orderNo, 'alin_callback_error', 'alin');
return;
}
@@ -244,7 +248,7 @@ trait alinPay
'zdl_id' => $zdl['id'],
'zdl_username' => $zdl['username'],
'zdl_money_before' => $zdl['money'],
'zdl_money_after' => $zdl['money'],
'zdl_money_after' => $zdl['money'] - $order['money'],
'money_before' => $user['money'],
'money_after' => $user['money'] + $order['money'],
]);
@@ -268,9 +272,9 @@ trait alinPay
'controller_id' => $zdl['id'],
'controller_username' => $zdl['username'],
'controller_nickname' => $zdl['nickname'],
'controller_type' => '越南第三方充值平台充值，系统直充',
'controller_type' => '越南第三方充值平台充值，扣取总代理余分',
'controller_old_money' => $zdl['money'],
'controller_new_money' => $zdl['money'],
'controller_new_money' => $zdl['money'] - $order['money'],
'user_id' => $order['user_id'],
'user_type' => $user['agent'],
'user_agent_level' => 0,
@@ -284,8 +288,9 @@ trait alinPay
'remake' => '越南AlinPay第三方充值成功',
]);
// 4. 更新代理统计（不扣余额）
// 4. 扣代理余额
Db::name('user')->where('id', $zdl['id'])->update([
'money' => $zdl['money'] - $order['money'],
'last_recharge_out' => $order['money'],
'last_recharge_out_time' => time(),
'recharge_out_count' => $zdl['recharge_out_count'] + 1,