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; }