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-26 14:57:44 +08:00
commit 9be16eb9c3
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/common/logic/store_order/StoreOrderLogic.php
View File

@ -288,6 +288,9 @@ class StoreOrderLogic extends BaseLogic
*/ */
public function storeOrderCount($storeId, $status, $paid = 1) public function storeOrderCount($storeId, $status, $paid = 1)
{ {
if(empty($storeId)){
return StoreOrder::where(['status' => $status, 'paid' => $paid])->count();
}
return StoreOrder::where(['store_id' => $storeId, 'status' => $status, 'paid' => $paid])->count(); return StoreOrder::where(['store_id' => $storeId, 'status' => $status, 'paid' => $paid])->count();
} }

6
app/store/controller/store_order/StoreOrderController.php
View File

@ -59,9 +59,9 @@ class StoreOrderController extends BaseAdminController
'pay_type' => PayEnum::getPaySceneDesc(), 'pay_type' => PayEnum::getPaySceneDesc(),
'order_status' => [ 'order_status' => [
'wait_send' => $orderLogic->storeOrderCount($this->request->adminInfo['store_id'], 0), 'wait_send' => $orderLogic->storeOrderCount($this->request->adminInfo['store_id'], 0),
'to_be_paid' => $orderLogic->storeOrderCount($this->request->adminInfo['store_id'], 0, 0), 'to_be_paid' => $orderLogic->storeOrderCount(0, 0, 0),
'wait_receive' => $orderLogic->storeOrderCount($this->request->adminInfo['store_id'], 1), 'wait_receive' => $orderLogic->storeOrderCount(0, 1),
'finish' => $orderLogic->storeOrderCount($this->request->adminInfo['store_id'], 2), 'finish' => $orderLogic->storeOrderCount(0, 2),
], ],
]); ]);
} }

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

@ -54,6 +54,22 @@ class StoreOrderLists extends BaseAdminDataLists implements ListsSearchInterface
} elseif ($is_sashier == 2) { //小程序订单 } elseif ($is_sashier == 2) { //小程序订单
$this->searchWhere[] = ['pay_type', 'in', [7, 3, 18,19]]; $this->searchWhere[] = ['pay_type', 'in', [7, 3, 18,19]];
} }
$status = $this->request->get('status','');
switch ($status){
case -1:
$this->searchWhere[] = ['status', '=', 0];
$this->searchWhere[] = ['paid', '=', 0];
break;
case 1:
$this->searchWhere[] = ['status', '=', 1];
$this->searchWhere[] = ['paid', '=', 1];
break;
case 2:
$this->searchWhere[] = ['status', '=', 2];
$this->searchWhere[] = ['paid', '=', 1];
break;
}
return StoreOrder::where($this->searchWhere)->with(['user']) return StoreOrder::where($this->searchWhere)->with(['user'])
->field(['id', 'order_id', 'pay_price', 'pay_time','uid', 'pay_type', 'status', 'paid', 'total_num']) ->field(['id', 'order_id', 'pay_price', 'pay_time','uid', 'pay_type', 'status', 'paid', 'total_num'])
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)