mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/purchase_record' into dev

Browse Source
This commit is contained in:
luofei 2023-07-10 09:37:11 +08:00
commit 05c6599bb7
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/common/repositories/store/order/StoreGroupOrderRepository.php
View File

@ -69,7 +69,7 @@ class StoreGroupOrderRepository extends BaseRepository
}, 'orderProduct','presellOrder']); }, 'orderProduct','presellOrder']);
}, 'interest'])->page($page, $limit)->order('create_time DESC')->select(); }, 'interest'])->page($page, $limit)->order('create_time DESC')->select();
foreach ($list as $k => $item) { foreach ($list as $k => $item) {
if (is_callable([$item->interest, 'calculateInterest'])) { if (!empty($item->interest)) {
$interest = $item->interest->calculateInterest(); $interest = $item->interest->calculateInterest();
$list[$k]['interest']['total_amount'] = bcadd($item->interest->total_price, $interest, 2); $list[$k]['interest']['total_amount'] = bcadd($item->interest->total_price, $interest, 2);
} }
@ -101,11 +101,10 @@ class StoreGroupOrderRepository extends BaseRepository
}, 'orderProduct', 'presellOrder']); }, 'orderProduct', 'presellOrder']);
}, 'interest']) }, 'interest'])
->order('create_time DESC')->find(); ->order('create_time DESC')->find();
$interest = '0'; if (!empty($order->interest)) {
if (is_callable([$order->interest, 'calculateInterest'])) {
$interest = $order->interest->calculateInterest(); $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; return $order;
} }