conditions

This commit is contained in:
邓皓元 2019-01-04 09:52:08 +08:00
parent e2e751a410
commit dac0852ba0

View File

@ -69,12 +69,12 @@ class OrderController extends Controller
$order_at = Carbon::parse($res->last()->order_at);
$conditions['starttime'] = $order_at->copy()->startOfMonth()->startOfDay()->format('Y-m-d H:i:s');
$conditions['endtime'] = $order_at->copy()->endOfMonth()->endOfDay()->format('Y-m-d H:i:s');
} else {
$count = $this->orderService->count($conditions);
$count['starttime'] = $conditions['starttime'];
$count['endtime'] = $conditions['endtime'];
}
$count = $this->orderService->count($conditions);
$count['starttime'] = $conditions['starttime'];
$count['endtime'] = $conditions['endtime'];
return res(['count' => $count, 'orders' => $res], '订单列表', 201);
}