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-08 18:04:57 +08:00
commit d9c5efc32e
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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