feat : coupon
This commit is contained in:
@@ -54,7 +54,7 @@ class OrderListService extends BaseService
|
||||
{
|
||||
$limit = (int)$this->request->input('limit', 20);
|
||||
|
||||
//todo where
|
||||
//todo where kitchenID
|
||||
$orderList = $this->orderModel
|
||||
->when($this->request->input('search_user_id'), function ($query) {
|
||||
$query->where('user_id', $this->request->input('search_user_id'));
|
||||
@@ -62,6 +62,9 @@ class OrderListService extends BaseService
|
||||
->when($this->request->input('search_status'), function ($query) {
|
||||
$query->where('status', $this->request->input('search_status'));
|
||||
})
|
||||
->when($this->request->input('city_id'), function ($query) {
|
||||
$query->where('city_id', $this->request->input('city_id'));
|
||||
})
|
||||
->select([
|
||||
'id',
|
||||
'cycle_id',
|
||||
|
||||
@@ -194,6 +194,7 @@ class PlaceOrderService extends BaseOrderService
|
||||
$orderInsertModel->cycle_id = $this->cycleId;
|
||||
$orderInsertModel->site_id = $this->siteId;
|
||||
$orderInsertModel->city_id = $this->orderRes['site_info']['city_id'];
|
||||
$orderInsertModel->kitchen_id = $this->orderRes['site_info']['kitchen_id'];
|
||||
$orderInsertModel->coupon_id = $this->couponId;
|
||||
$orderInsertModel->copies = $this->orderRes['copies'];
|
||||
$orderInsertModel->type = $this->orderType;
|
||||
|
||||
Reference in New Issue
Block a user