|
|
@@ -296,7 +296,8 @@ class TransferLogic
|
|
|
}
|
|
|
|
|
|
// 计算手续费
|
|
|
- $feeInfo = $app->calculateOutFee($amount, [ 'user_id' => $data['user_id'] ]);
|
|
|
+
|
|
|
+ $feeInfo = FeeService::calculateOutFee($app, $amount, [ 'user_id' => $data['user_id'] ]);
|
|
|
|
|
|
// 生成外部订单ID
|
|
|
$outOrderId = self::generateOutOrderId('OUT');
|
|
|
@@ -315,9 +316,10 @@ class TransferLogic
|
|
|
'out_amount' => $outAmount,
|
|
|
'amount' => $amount,
|
|
|
'exchange_rate' => $app->exchange_rate,
|
|
|
- 'fee_rate' => $feeInfo['fee_rate'],
|
|
|
- 'fee_amount' => $feeInfo['fee_amount'],
|
|
|
- 'actual_amount' => $feeInfo['actual_amount'],
|
|
|
+ 'fee_rate' => $feeInfo->feeRate,
|
|
|
+ 'fee_amount' => $feeInfo->feeAmount,
|
|
|
+ 'actual_amount' => $feeInfo->actualAmount,
|
|
|
+ 'totle_amount' => $feeInfo->totleAmount,
|
|
|
'callback_data' => $data['callback_data'] ?? [],
|
|
|
'remark' => $data['remark'] ?? null,
|
|
|
]);
|