|
|
@@ -458,7 +458,7 @@ class OrderService implements OrderServiceInterface
|
|
|
->where('ad_place.website_id', $data['website_id'])
|
|
|
->leftJoin('website', 'ad_place.website_id', 'website.id')
|
|
|
->leftJoin('ad_size','ad_place.ad_size_id','ad_size.id')
|
|
|
- ->select('ad_place.*', 'website.website_name', 'website.id')
|
|
|
+ ->select('ad_place.*', 'website.website_name', 'website.id','ad_size.*')
|
|
|
->selectSub('website.id', 'webid')
|
|
|
->selectSub('ad_place.id', 'pid')
|
|
|
->selectSub('ad_size.width','size_width')
|
|
|
@@ -477,7 +477,7 @@ class OrderService implements OrderServiceInterface
|
|
|
->where('ad_place.website_id', $data['website_id'])
|
|
|
->leftJoin('website', 'ad_place.website_id', 'website.id')
|
|
|
->leftJoin('ad_size','ad_place.ad_size_id','ad_size.id')
|
|
|
- ->select('ad_place.*', 'website.website_name', 'website.id')
|
|
|
+ ->select('ad_place.*', 'website.website_name', 'website.id','ad_size.*')
|
|
|
->selectSub('website.id', 'webid')
|
|
|
->selectSub('ad_place.id', 'pid')
|
|
|
->selectSub('ad_size.width','size_width')
|
|
|
@@ -555,7 +555,6 @@ class OrderService implements OrderServiceInterface
|
|
|
$catetime = date('Y-m-d H:i:s', $time);
|
|
|
$randomNumber = mt_rand(1000, 9999);
|
|
|
$ordernum = $randomNumber . $timestamp; // 时间戳与随机数拼接
|
|
|
- $order_size = AdSize::where('id', $data['ad_size_id'])->first();
|
|
|
// var_dump(($time));
|
|
|
Db::beginTransaction();
|
|
|
try {
|
|
|
@@ -566,8 +565,7 @@ class OrderService implements OrderServiceInterface
|
|
|
'edtime' => $data['endtime'],
|
|
|
'user_id' => $data['user_id'],
|
|
|
'cttime' => $catetime,
|
|
|
- 'width' => $order_size['width'],
|
|
|
- 'height' => $order_size['height'],
|
|
|
+ 'ad_size_id' => $data['ad_size_id'],
|
|
|
'days' => $days,
|
|
|
'price' => $data['price'],
|
|
|
'created_at' => date('Y-m-d H:i:s', time()),
|
15313670163