hydrz/vd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

else

Browse Source
This commit is contained in:
邓皓元 2019-01-04 09:49:43 +08:00
parent 9451a007ec
commit e2e751a410
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Domains/Company/Http/Controllers/OrderController.php
View File

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