|
|
@@ -827,12 +827,11 @@ class OrderService extends BaseService
|
|
|
$meetingId = isset($params['meeting_id'])?$params['meeting_id']:0;
|
|
|
$userId = isset($params['user_id'])?$params['user_id']:0;
|
|
|
$sid = isset($params['store_id'])?$params['store_id']:0;
|
|
|
-
|
|
|
$storeId = $storeId?$storeId:$sid;
|
|
|
|
|
|
// 总订单数
|
|
|
$total = $this->model->where('mark', 1)
|
|
|
- ->when(function ($query) use ($storeId,$meetingId,$userId) {
|
|
|
+ ->where(function ($query) use ($storeId,$meetingId,$userId) {
|
|
|
if($storeId){
|
|
|
$query->where('store_id', $storeId);
|
|
|
}
|
|
|
@@ -851,7 +850,7 @@ class OrderService extends BaseService
|
|
|
// 总交易额(已完成订单)
|
|
|
$totalAmount = $this->model->where('mark', 1)
|
|
|
->where('status', 4)
|
|
|
- ->when(function ($query) use ($storeId,$meetingId,$userId) {
|
|
|
+ ->where(function ($query) use ($storeId,$meetingId,$userId) {
|
|
|
if($storeId){
|
|
|
$query->where('store_id', $storeId);
|
|
|
}
|
|
|
@@ -870,7 +869,7 @@ class OrderService extends BaseService
|
|
|
// 待处理订单(待付款 + 已付款)
|
|
|
$pending = $this->model->where('mark', 1)
|
|
|
->whereIn('status', [1, 2])
|
|
|
- ->when(function ($query) use ($storeId,$meetingId,$userId) {
|
|
|
+ ->where(function ($query) use ($storeId,$meetingId,$userId) {
|
|
|
if($storeId){
|
|
|
$query->where('store_id', $storeId);
|
|
|
}
|
|
|
@@ -889,7 +888,7 @@ class OrderService extends BaseService
|
|
|
// 已完成
|
|
|
$complete = $this->model->where('mark', 1)
|
|
|
->where('status', 4)
|
|
|
- ->when(function ($query) use ($storeId,$meetingId,$userId) {
|
|
|
+ ->where(function ($query) use ($storeId,$meetingId,$userId) {
|
|
|
if($storeId){
|
|
|
$query->where('store_id', $storeId);
|
|
|
}
|