修改获取广告位

app/JsonRpc/OrderService.php

@@ -23,6 +23,7 @@ class OrderService implements OrderServiceInterface
      */
     public function getAD(array $data): array
     {
+
         if (!empty($data)) {
             $where = [
 
@@ -56,7 +57,7 @@ class OrderService implements OrderServiceInterface
                 $rep = AdPlace::whereIn('ad_place.id', $place_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')
@@ -70,7 +71,7 @@ class OrderService implements OrderServiceInterface
                 $rep = AdPlace::where($where)
                     ->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')
@@ -86,24 +87,25 @@ class OrderService implements OrderServiceInterface
             $time = ($endTime - $startTime) / (24 * 60 * 60);
             $roundedValue = round($time, 2);
             $days = number_format($roundedValue, 2, '.', '');
-            $data = [
+            $result = [
                 'rows' => $rep->toArray(),
                 'count' => $count,
                 'days' => $days,
             ];
 
-            if (empty($data['rows'])) {
+            if (empty($result['rows'])) {
                 return Result::error("暂无符合您条件的广告位！");
 
             }
         } else {
-            $data = AdSize::get();
-            if (empty($data)) {
+            $result = AdSize::get();
+            if (empty($result)) {
                 return Result::error('暂无广告尺寸！');
             }
         }
 
-        return Result::success($data);
+        return Result::success($result);
+
     }
     /**
      * 添加订单