|
@@ -428,7 +428,7 @@ class OrderService implements OrderServiceInterface
|
|
|
->orderBy("website.id", "asc")
|
|
|
->limit($data['pageSize'])
|
|
|
->offset(($data['page'] - 1) * $data['pageSize'])
|
|
|
- ->get();
|
|
|
+ ->get();
|
|
|
//若存在网站id,关联查询是需要添加website_id条件查询
|
|
|
}
|
|
|
} else {
|
|
@@ -443,7 +443,7 @@ class OrderService implements OrderServiceInterface
|
|
|
->orderBy("website.id", "asc")
|
|
|
->limit($data['pageSize'])
|
|
|
->offset(($data['page'] - 1) * $data['pageSize'])
|
|
|
- ->get();
|
|
|
+ ->get();
|
|
|
} else {
|
|
|
$place_all = AdPlace::where($where)->select('website_id')->get()->all();
|
|
|
$place_allads = [];
|
|
@@ -457,7 +457,7 @@ class OrderService implements OrderServiceInterface
|
|
|
if (empty($rep)) {
|
|
|
return Result::error("暂时没有符合您条件的广告位");
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
$startTime = strtotime($data['starttime']);
|
|
|
$endTime = strtotime($data['endtime']);
|
|
|
$time = ($endTime - $startTime) / (24 * 60 * 60);
|
|
@@ -501,6 +501,8 @@ class OrderService implements OrderServiceInterface
|
|
|
'height' => $data['height'],
|
|
|
'width' => $data['width'],
|
|
|
'days' => $days,
|
|
|
+ 'created_at' => date('Y-m-d H:i:s', time()),
|
|
|
+ 'updated_at' => date('Y-m-d H:i:s', time()),
|
|
|
|
|
|
];
|
|
|
$orderid = Order::insertGetId($order);
|
|
@@ -540,6 +542,8 @@ class OrderService implements OrderServiceInterface
|
|
|
'image_src' => $data['imgsrc'],
|
|
|
'image_url' => $data['imgurl'],
|
|
|
'pid' => $adplace,
|
|
|
+ 'created_at' => date('Y-m-d H:i:s', time()),
|
|
|
+ 'updated_at' => date('Y-m-d H:i:s', time()),
|
|
|
];
|
|
|
// $log = [
|
|
|
// 'order_id' => $orderid,
|
|
@@ -550,14 +554,14 @@ class OrderService implements OrderServiceInterface
|
|
|
// 'time' => $catetime
|
|
|
// ];
|
|
|
}
|
|
|
- $orderad_id = OrderAd::insert($order_ad);
|
|
|
- Db::commit();
|
|
|
+ $orderad_id = OrderAd::insert($order_ad);
|
|
|
+ Db::commit();
|
|
|
} catch (\Exception $e) {
|
|
|
Db::rollBack();
|
|
|
return Result::error($e->getMessage());
|
|
|
}
|
|
|
// $log = AdLog::insert($log);
|
|
|
-
|
|
|
+
|
|
|
$result = [
|
|
|
'order_id' => $orderid,
|
|
|
'orderad_id' => $orderad_id,
|