|
@@ -162,6 +162,7 @@ class OrderService implements OrderServiceInterface
|
|
|
$start = $data['sttime']??'';
|
|
$start = $data['sttime']??'';
|
|
|
|
|
|
|
|
$end = $data['edtime']??'';
|
|
$end = $data['edtime']??'';
|
|
|
|
|
+
|
|
|
// 查询数据并分页
|
|
// 查询数据并分页
|
|
|
$query = Order::where($where)
|
|
$query = Order::where($where)
|
|
|
->when(!empty($start) && !empty($end), function ($q) use ($start, $end) {
|
|
->when(!empty($start) && !empty($end), function ($q) use ($start, $end) {
|
|
@@ -534,6 +535,7 @@ class OrderService implements OrderServiceInterface
|
|
|
'updated_at' => date('Y-m-d H:i:s', time()),
|
|
'updated_at' => date('Y-m-d H:i:s', time()),
|
|
|
|
|
|
|
|
];
|
|
];
|
|
|
|
|
+
|
|
|
//添加订单
|
|
//添加订单
|
|
|
$orderid = Order::insertGetId($order);
|
|
$orderid = Order::insertGetId($order);
|
|
|
$adplace = $data['pid'];
|
|
$adplace = $data['pid'];
|
15313670163