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

Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev

Browse Source
This commit is contained in:
chan 2023-12-11 18:01:47 +08:00
commit 5f651e5481
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controller/api/dataview/Order.php
View File

@ -565,7 +565,11 @@ class Order extends BaseController
[$page,$limit] = $this->getPage();
$where = $this->request->params(['refund_order_sn','status','refund_type','date','mer_id','order_sn','is_trader']);
$list = $repository->getAllList($where, $page, $limit);
<<<<<<< HEAD
halt($list['list']->toArray());
=======
halt($list);
>>>>>>> 858b4a267df5a3394b1e8ff44515ae6ee4f09bf4
foreach($list['list'] as &$item) {
$userAddressCode = explode(',', $item['order']['user_address_code']);
$area = Db::name('geo_area')->where('area_code', $userAddressCode[0])->value('area_name');