|
@@ -608,11 +608,12 @@ class OrderService implements OrderServiceInterface
|
|
|
->orderBy("updated_at", "desc")
|
|
|
->get()->all();
|
|
|
//订单状态:1:通过;2:驳回;3:撤回;4:修改;5:过期;6:待审核;7:结束
|
|
|
- $status = [1,4,5,7];
|
|
|
+
|
|
|
$count['all'] = Order::where('user_id',$data['user_id'])->where('user_del','2')->count();
|
|
|
- $count['wait'] = Order::where('user_id',$data['user_id'])->where('user_del','2')->where('status',6)->count();
|
|
|
- $count['pass'] = Order::where('user_id',$data['user_id'])->where('user_del','2')->whereIn('status',$status)->whereNull('bhtime')->count();
|
|
|
+ $count['wait'] = Order::where('user_id',$data['user_id'])->where('user_del','2')->whereIn('status',[5,6])->count();
|
|
|
+ $count['pass'] = Order::where('user_id',$data['user_id'])->where('user_del','2')->whereIn('status',[1,7])->count();
|
|
|
$count['return'] = Order::where('user_id',$data['user_id'])->where('user_del','2')->whereNotNull('bhtime')->count();
|
|
|
+
|
|
|
foreach($orders as $key => $val){
|
|
|
$adsnum = OrderAd::where('order_id',$val['id'])->count();
|
|
|
$rep[$key] = $val;
|