From 1496f283b3b4b310b27dce397a91761822d1b816 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Sat, 8 Jul 2023 15:13:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95=E4=BF=A1=E7=94=A8=E8=B4=AD?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=BB=93=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/repositories/store/order/StoreOrderRepository.php | 2 +-
 app/listener/OrderTake.php                                   | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

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');