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

Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev

Browse Source
This commit is contained in:
mkm 2024-06-21 13:37:45 +08:00
commit fcfb89a066
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/store/lists/store_order/StoreOrderLists.php
View File

@ -54,12 +54,15 @@ class StoreOrderLists extends BaseAdminDataLists implements ListsSearchInterface
}elseif($is_sashier==2){//小程序订单
$this->searchWhere[] = ['pay_type','in',[7,3,18]];
}
return StoreOrder::where($this->searchWhere)
return StoreOrder::where($this->searchWhere)
->field(['id', 'order_id', 'pay_price', 'pay_time', 'pay_type', 'status','paid'])
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()->each(function ($item) use ($store_id) {
$item['pay_time'] = $item['pay_time'] > 0 ? date('Y-m-d H:i:s', $item['pay_time']) : '';
if(empty($item['pay_time'])){
$item['pay_time'] = '';
}
// $item['pay_time'] = $item['pay_time'] > 0 ? date('Y-m-d H:i:s', $item['pay_time']) : '';
$item['pay_type_name'] =PayEnum::getPaySceneDesc($item['pay_type']) ?? '';
$item['status_name'] = OrderEnum::getOrderType($item['status']) ?? '';
if ($item['paid'] == 0) {
@ -75,8 +78,6 @@ class StoreOrderLists extends BaseAdminDataLists implements ListsSearchInterface
$item['product_info'] = [];
}
return $item;
})
->toArray();