From 89b59397389373c4e0326876c1db352818a21ff0 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Mon, 10 Jul 2023 09:37:01 +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

---
 .../repositories/store/order/StoreGroupOrderRepository.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/common/repositories/store/order/StoreGroupOrderRepository.php b/app/common/repositories/store/order/StoreGroupOrderRepository.php
index 70edf4a4..3a19de60 100644
--- a/app/common/repositories/store/order/StoreGroupOrderRepository.php
+++ b/app/common/repositories/store/order/StoreGroupOrderRepository.php
@@ -69,7 +69,7 @@ class StoreGroupOrderRepository extends BaseRepository
             }, 'orderProduct','presellOrder']);
         }, 'interest'])->page($page, $limit)->order('create_time DESC')->select();
         foreach ($list as $k => $item) {
-            if (is_callable([$item->interest, 'calculateInterest'])) {
+            if (!empty($item->interest)) {
                 $interest = $item->interest->calculateInterest();
                 $list[$k]['interest']['total_amount'] = bcadd($item->interest->total_price, $interest, 2);
             }
@@ -101,11 +101,10 @@ class StoreGroupOrderRepository extends BaseRepository
                 }, 'orderProduct', 'presellOrder']);
             }, 'interest'])
             ->order('create_time DESC')->find();
-        $interest = '0';
-        if (is_callable([$order->interest, 'calculateInterest'])) {
+        if (!empty($order->interest)) {
             $interest = $order->interest->calculateInterest();
+            $order['interest']['total_amount'] = bcadd($order->interest->total_price, $interest, 2);
         }
-        $order['interest']['total_amount'] = bcadd($order->interest->total_price, $interest, 2);
         return $order;
     }