diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php index 769a3b9d..3e28b874 100644 --- a/app/common/repositories/store/order/StoreOrderRepository.php +++ b/app/common/repositories/store/order/StoreOrderRepository.php @@ -2477,7 +2477,7 @@ class StoreOrderRepository extends BaseRepository } $groupOrder->interest->interest = $interest; 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->settle_time = date('Y-m-d H:i:s'); diff --git a/app/listener/OrderTake.php b/app/listener/OrderTake.php index 96a81048..73da22b5 100644 --- a/app/listener/OrderTake.php +++ b/app/listener/OrderTake.php @@ -16,9 +16,6 @@ class OrderTake public function handle($event) { $order = $event['order']; - if ($order['merchant']['interest_rate'] <= 0) { - return true; - } /** @var StoreOrderInterestRepository $storeOrderInterestRepository */ $storeOrderInterestRepository = app()->make(StoreOrderInterestRepository::class); $merchantId = Merchant::where('uid', $order['uid'])->value('mer_id');