|
@@ -584,19 +584,22 @@ class OrderService implements OrderServiceInterface
|
|
if (isset($data['status'])) {
|
|
if (isset($data['status'])) {
|
|
$where['status'] = $data['status'];
|
|
$where['status'] = $data['status'];
|
|
}
|
|
}
|
|
- $orders = Order::where($where)->get()->all();
|
|
|
|
- $order = [];
|
|
|
|
|
|
+ $orders = Order::where($where)
|
|
|
|
+ ->limit($data['pageSize'])
|
|
|
|
+ ->offset(($data['page'] - 1) * $data['pageSize'])
|
|
|
|
+ ->get()->all();
|
|
|
|
+ $count = Order::where($where)->count();
|
|
foreach($orders as $key => $val){
|
|
foreach($orders as $key => $val){
|
|
$adsnum = OrderAd::where('order_id',$val['id'])->count();
|
|
$adsnum = OrderAd::where('order_id',$val['id'])->count();
|
|
- $order[$key] = $val;
|
|
|
|
- $order[$key]['num'] = $adsnum;
|
|
|
|
|
|
+ $rep[$key] = $val;
|
|
|
|
+ $rep[$key]['num'] = $adsnum;
|
|
}
|
|
}
|
|
- if (empty($order)) {
|
|
|
|
|
|
+ if (empty($rep)) {
|
|
return Result::error("您暂时还没有下单");
|
|
return Result::error("您暂时还没有下单");
|
|
} else {
|
|
} else {
|
|
- $count = count($order);
|
|
|
|
|
|
+
|
|
$data = [
|
|
$data = [
|
|
- 'rows' => $order,
|
|
|
|
|
|
+ 'rows' => $rep,
|
|
'count' => $count,
|
|
'count' => $count,
|
|
];
|
|
];
|
|
}
|
|
}
|