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-07-08 15:13:32 +08:00
parent ecb7348376
commit 1496f283b3
2 changed files with 1 additions and 4 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

@ -2477,7 +2477,7 @@ class StoreOrderRepository extends BaseRepository
} }
$groupOrder->interest->interest = $interest; $groupOrder->interest->interest = $interest;
if ($result === true) { if ($result === true) {
app()->make(MerchantRepository::class)->computedLockMoney($groupOrder->order); app()->make(MerchantRepository::class)->computedLockMoney($groupOrder->orderList[0]);
$groupOrder->interest->status = StoreOrderInterest::STATUS_SETTLED; $groupOrder->interest->status = StoreOrderInterest::STATUS_SETTLED;
$groupOrder->interest->settle_time = date('Y-m-d H:i:s'); $groupOrder->interest->settle_time = date('Y-m-d H:i:s');

3
app/listener/OrderTake.php
View File

@ -16,9 +16,6 @@ class OrderTake
public function handle($event) public function handle($event)
{ {
$order = $event['order']; $order = $event['order'];
if ($order['merchant']['interest_rate'] <= 0) {
return true;
}
/** @var StoreOrderInterestRepository $storeOrderInterestRepository */ /** @var StoreOrderInterestRepository $storeOrderInterestRepository */
$storeOrderInterestRepository = app()->make(StoreOrderInterestRepository::class); $storeOrderInterestRepository = app()->make(StoreOrderInterestRepository::class);
$merchantId = Merchant::where('uid', $order['uid'])->value('mer_id'); $merchantId = Merchant::where('uid', $order['uid'])->value('mer_id');