From ea9384beea066d9aaf7d5011cd2f767c4cbedcb0 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Sat, 8 Jul 2023 18:04:42 +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

---
 .../store/order/StoreGroupOrderRepository.php             | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/common/repositories/store/order/StoreGroupOrderRepository.php b/app/common/repositories/store/order/StoreGroupOrderRepository.php
index 33ce0de3..53e7fc25 100644
--- a/app/common/repositories/store/order/StoreGroupOrderRepository.php
+++ b/app/common/repositories/store/order/StoreGroupOrderRepository.php
@@ -67,7 +67,13 @@ class StoreGroupOrderRepository extends BaseRepository
             $query->field('order_id,group_order_id,activity_type,pay_price,status,mer_id')->with(['merchant' => function ($query) {
                 $query->field('mer_id,mer_name,settle_cycle,interest_rate');
             }, 'orderProduct','presellOrder']);
-        }])->page($page, $limit)->order('create_time DESC')->select();
+        }, 'interest'])->page($page, $limit)->order('create_time DESC')->select();
+        foreach ($list as $k => $item) {
+            if (is_callable([$item->interest, 'calculateInterest'])) {
+                $interest = $item->interest->calculateInterest();
+                $list[$k]['interest']['total_amount'] = bcadd($item->interest->total_price, $interest, 2);
+            }
+        }
         return compact('count', 'list');
     }