|
|
@@ -136,9 +136,9 @@ class OrderService extends BaseService
|
|
|
$query4 = clone $query;
|
|
|
$counts = [
|
|
|
'total' => $query1->count('id'),
|
|
|
- 'totalAmount' => $query2->where(['status'=>4])->sum('pay_total'),
|
|
|
+ 'totalAmount' => $query2->whereIn('status',[2,3,4,5])->sum('pay_total'),
|
|
|
'pending' => $query3->whereIn('status',[1,2])->count('id'),
|
|
|
- 'complete' => $query4->where(['status'=>4])->count('id'),
|
|
|
+ 'complete' => $query4->whereIn('status',[4,5])->count('id'),
|
|
|
];
|
|
|
|
|
|
$list = $query->with(['user', 'orderGoods', 'store','commission'])
|
