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

Merge pull request 'feat(StoreOrderCartInfoTwoLists): 根据请求参数调整导出逻辑' (#228) from bb into main

Browse Source 
Reviewed-on: #228
This commit is contained in:
mkm 2024-09-20 11:10:31 +08:00
commit 4ea350a67b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/admin/lists/store_order_cart_info/StoreOrderCartInfoTwoLists.php
View File

@ -65,7 +65,7 @@ class StoreOrderCartInfoTwoLists extends BaseAdminDataLists implements ListsSear
$this->searchWhere[] = ['create_time', 'between', [strtotime(date('Y-m-d 00:00:00')), strtotime(date('Y-m-d 23:59:59'))]];
}
$is_group=$this->request->get('is_group');
$export=$this->request->get('export',0);
$export=$this->request->get('export');
$this->searchWhere[] = ['is_pay', '=', 1];
$this->searchWhere[] = ['status', '>=', 0];
$query = StoreOrderCartInfo::where($this->searchWhere);
@ -80,7 +80,7 @@ class StoreOrderCartInfoTwoLists extends BaseAdminDataLists implements ListsSear
$item['nickname']='';
$item['mobile']='';
$item['order_id']='';
if($export>0){
if($export==2){
$item['order_id']=StoreOrder::where('id',$item['oid'])->value('order_id');
}
if ($find) {