wallet_fix
This commit is contained in:
@ -32,6 +32,7 @@ class WalletPlatformUserTransactionModel extends WalletBaseModel
|
||||
'currency_type',
|
||||
'from_wallet_addr_id',
|
||||
'wallet_addr',
|
||||
'from_wallet_transaction_id',
|
||||
'received_amount',
|
||||
'entered_amount',
|
||||
'fee_amount',
|
||||
@ -88,7 +89,7 @@ class WalletPlatformUserTransactionModel extends WalletBaseModel
|
||||
|
||||
//冻结平台余额并增加账变
|
||||
$oWalletPlatformBalanceTransactionModel = new WalletPlatformBalanceTransactionModel();
|
||||
$resWalletPlatformBalanceTransactionModel = $oWalletPlatformBalanceTransactionModel->newWithdrawPlatformTransaction($amount, $platform_id, $currency_code);
|
||||
$resWalletPlatformBalanceTransactionModel = $oWalletPlatformBalanceTransactionModel->newWithdrawPlatformTransaction($amount, $platform_id, $currency_code,$uid);
|
||||
if (!$resWalletPlatformBalanceTransactionModel) throw new ModelException('newWithdrawPlatformTransaction error');
|
||||
|
||||
//根据币种计算费率
|
||||
@ -137,7 +138,7 @@ class WalletPlatformUserTransactionModel extends WalletBaseModel
|
||||
return $this->addItem($insert);
|
||||
}
|
||||
|
||||
function addRechargeTransaction($platform_id, $uid, $oWalletCurrencyModel, $amount, $desc_key = null, $desc = '', $remark = ''): \Illuminate\Database\Eloquent\Model|\Illuminate\Database\Eloquent\Builder|bool
|
||||
function addRechargeTransaction($resWalletAddrTransactionModel,$platform_id, $uid, $oWalletCurrencyModel, $amount, $desc_key = null, $desc = '', $remark = ''): \Illuminate\Database\Eloquent\Model|\Illuminate\Database\Eloquent\Builder|bool
|
||||
{
|
||||
$amount = abs($amount);
|
||||
$insert = [
|
||||
@ -148,6 +149,9 @@ class WalletPlatformUserTransactionModel extends WalletBaseModel
|
||||
'currency_id' => $oWalletCurrencyModel->id,
|
||||
'currency_code' => $oWalletCurrencyModel->code,
|
||||
'currency_type' => $oWalletCurrencyModel->type,
|
||||
'from_wallet_addr_id' => $resWalletAddrTransactionModel->wallet_addr_id,
|
||||
'wallet_addr' => $resWalletAddrTransactionModel->wallet_addr,
|
||||
'from_wallet_transaction_id' => $resWalletAddrTransactionModel->id,
|
||||
'received_amount' => $amount,
|
||||
'entered_amount' => $amount,
|
||||
'desc_key' => $desc_key ?? '',
|
||||
@ -158,14 +162,14 @@ class WalletPlatformUserTransactionModel extends WalletBaseModel
|
||||
return $this->addItem($insert);
|
||||
}
|
||||
|
||||
function addTransactionWithPlatformBalance($platform_id, $uid, $oWalletCurrencyModel, $amount, $desc_key = null, $desc = '', $remark = '')
|
||||
function addTransactionWithPlatformBalance($resWalletAddrTransactionModel,$platform_id, $uid, $oWalletCurrencyModel, $amount, $desc_key = null, $desc = '', $remark = '')
|
||||
{
|
||||
try {
|
||||
Db::beginTransaction();
|
||||
$resModel = $this->addRechargeTransaction($platform_id, $uid, $oWalletCurrencyModel, $amount, $desc_key, $desc, $remark);
|
||||
$resModel = $this->addRechargeTransaction($resWalletAddrTransactionModel,$platform_id, $uid, $oWalletCurrencyModel, $amount, $desc_key, $desc, $remark);
|
||||
if(!$resModel) throw new ModelException('addRechargeTransaction error');
|
||||
$oWalletPlatformBalanceTransactionModel = new WalletPlatformBalanceTransactionModel();
|
||||
$res = $oWalletPlatformBalanceTransactionModel->newRechargePlatformTransaction($amount, $platform_id, $oWalletCurrencyModel->code);
|
||||
$res = $oWalletPlatformBalanceTransactionModel->newRechargePlatformTransaction($resWalletAddrTransactionModel,$resModel,$amount, $platform_id, $oWalletCurrencyModel->code);
|
||||
if(!$res) throw new ModelException('newRechargePlatformTransaction error');
|
||||
Db::commit();
|
||||
return true;
|
||||
@ -334,6 +338,7 @@ class WalletPlatformUserTransactionModel extends WalletBaseModel
|
||||
|
||||
//给用户增加账变/平台增加账变增加余额
|
||||
$this->addTransactionWithPlatformBalance(
|
||||
$resWalletAddrTransactionModel,
|
||||
$resWalletPlatformUserWalletAddrModel->platform_id,
|
||||
$resWalletPlatformUserWalletAddrModel->uid,
|
||||
$resWalletCurrencyModel,
|
||||
|
||||
Reference in New Issue
Block a user