mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调试平台手续费分润

Browse Source
This commit is contained in:
luofei 2023-05-26 11:01:44 +08:00
parent a70a4de2e3
commit fb6aa84bfa
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/common/repositories/store/order/StoreOrderRepository.php
View File

@ -351,7 +351,7 @@ class StoreOrderRepository extends BaseRepository
$merchantRepo = app()->make(MerchantRepository::class); $merchantRepo = app()->make(MerchantRepository::class);
$merchantRepo->merId = $order->mer_id; $merchantRepo->merId = $order->mer_id;
$merchantRepo->forceMargin = false; $merchantRepo->forceMargin = false;
[$_payPrice, $finance] = $merchantRepo->autoMargin($_payPrice, $order, $finance, $financeSn, $i++); [$_payPrice, $finance, $increase] = $merchantRepo->autoMargin($_payPrice, $order, $finance, $financeSn, $i++);
} }
$finance[] = [ $finance[] = [
'order_id' => $order->order_id, 'order_id' => $order->order_id,

4
app/common/repositories/system/merchant/MerchantRepository.php
View File

@ -672,7 +672,7 @@ class MerchantRepository extends BaseRepository
$merchant = Merchant::find($this->merId); $merchant = Merchant::find($this->merId);
//商户保证金未完全缴纳且设置了自动扣除比例 //商户保证金未完全缴纳且设置了自动扣除比例
if ($merchant['margin'] <= $merchant['paid_margin'] || ($this->forceMargin === false && $merchant['auto_margin_rate'] <= 0 && $merchant['auto_margin_rate'] > 100)) { if ($merchant['margin'] <= $merchant['paid_margin'] || ($this->forceMargin === false && $merchant['auto_margin_rate'] <= 0 && $merchant['auto_margin_rate'] > 100)) {
return [$income, $finance]; return [$income, $finance, false];
} }
$rate = $this->forceMargin ? 100 : $merchant['auto_margin_rate']; $rate = $this->forceMargin ? 100 : $merchant['auto_margin_rate'];
//商户保证金未完全缴纳且设置了自动扣除比例 //商户保证金未完全缴纳且设置了自动扣除比例
@ -692,7 +692,7 @@ class MerchantRepository extends BaseRepository
'financial_record_sn' => $financeSn . $index 'financial_record_sn' => $financeSn . $index
]; ];
Queue::push(AutoMarginJob::class, ['merId' => $this->merId, 'margin' => $margin]); Queue::push(AutoMarginJob::class, ['merId' => $this->merId, 'margin' => $margin]);
return [$income, $finance]; return [$income, $finance, true];
} }

18
app/listener/paySuccessOrder.php
View File

@ -55,12 +55,6 @@ class paySuccessOrder
if ($entryMerchant['type_id'] == Merchant::TypeStore) { if ($entryMerchant['type_id'] == Merchant::TypeStore) {
$merchantRate = systemConfig('commission_to_merchant_rate'); $merchantRate = systemConfig('commission_to_merchant_rate');
$merchantAmount = bcmul($this->totalAmount, (string)($merchantRate / 100), 2); $merchantAmount = bcmul($this->totalAmount, (string)($merchantRate / 100), 2);
/** @var MerchantRepository $merchantRepo */
$merchantRepo = app()->make(MerchantRepository::class);
$merchantRepo->merId = $entryMerId;
$merchantRepo->forceMargin = true;
[$merchantAmount, $this->finance] = $merchantRepo->autoMargin($merchantAmount, $event['order'], $this->finance, $this->financeSn, $this->index);
$this->index++;
if ($merchantAmount > 0) { if ($merchantAmount > 0) {
$this->finance[] = [ $this->finance[] = [
'order_id' => $this->event['order']['order_id'], 'order_id' => $this->event['order']['order_id'],
@ -75,7 +69,17 @@ class paySuccessOrder
'financial_record_sn' => $this->financeSn . $this->index 'financial_record_sn' => $this->financeSn . $this->index
]; ];
$this->index++; $this->index++;
app()->make(MerchantRepository::class)->addLockMoney($entryMerId, 'order', $event['order']['order_id'], (float)$merchantAmount); /** @var MerchantRepository $merchantRepo */
$merchantRepo = app()->make(MerchantRepository::class);
$merchantRepo->merId = $entryMerId;
$merchantRepo->forceMargin = true;
[$merchantAmount, $this->finance, $increase] = $merchantRepo->autoMargin($merchantAmount, $event['order'], $this->finance, $this->financeSn, $this->index);
if ($increase) {
$this->index++;
}
if ($merchantAmount > 0) {
app()->make(MerchantRepository::class)->addLockMoney($entryMerId, 'order', $event['order']['order_id'], (float)$merchantAmount);
}
} }
} }