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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
liu 2024-03-11 10:57:02 +08:00
commit 4a5caa8af3
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controller/api/server/StoreOrder.php
View File

@ -80,7 +80,11 @@ class StoreOrder extends BaseController
$where['order_search'] = $this->request->param('search_info');
$where['mer_id'] = $merId;
$where['is_del'] = 0;
return app('json')->success($repository->merchantGetList($where, $page, $limit));
$result = $repository->merchantGetList($where, $page, $limit);
foreach ($result['list'] as &$item) {
$item['pay_price'] = $item['consumption_money'] > 0 ? bcadd($item['pay_price'], $item['consumption_money'], 2) : $item['pay_price'];
}
return app('json')->success($result);
}
public function order($merId, $id, StoreOrderRepository $repository)