修改getWebsiteAd方法

app/JsonRpc/OrderService.php

@@ -411,7 +411,7 @@ class OrderService implements OrderServiceInterface
                 foreach ($placeids as $v) {
                     array_push($website_id, $v['website_id']);
                 }
-                $result = Website::whereIn('id', $website_id)->get();
+                $rep = Website::whereIn('id', $website_id)->get();
                 //若不存在网站id参数直接返回符合条件的广告位相关联的网站名称
             } else {
                 $place_id = [];
@@ -428,12 +428,7 @@ class OrderService implements OrderServiceInterface
                     ->orderBy("website.id", "asc")
                     ->limit($data['pageSize'])
                     ->offset(($data['page'] - 1) * $data['pageSize'])
-                    ->get();
-                $count = count($rep);
-                $result = [
-                    'rows' => $rep->toArray(),
-                    'count' => $count,
-                ];
+                    ->get();              
                 //若存在网站id，关联查询是需要添加website_id条件查询
             }
         } else {
@@ -448,25 +443,21 @@ class OrderService implements OrderServiceInterface
                     ->orderBy("website.id", "asc")
                     ->limit($data['pageSize'])
                     ->offset(($data['page'] - 1) * $data['pageSize'])
-                    ->get();
-                $count = count($rep);
-                $result = [
-                    'rows' => $rep->toArray(),
-                    'count' => $count,
-                ];
+                    ->get();               
             } else {
                 $place_all = AdPlace::where($where)->select('website_id')->get()->all();
                 $place_allads = [];
                 foreach ($place_all as $v) {
                     array_push($place_allads, $v['website_id']);
                 }
-                $result = Website::whereIn('id', $place_allads)->get();
+                $rep = Website::whereIn('id', $place_allads)->get();
 
             }
         }
-        if (empty($data)) {
+        if (empty($rep)) {
             return Result::error("暂时没有符合您条件的广告位");
         }
+        
         $startTime = strtotime($data['starttime']);
         $endTime = strtotime($data['endtime']);
         $time = ($endTime - $startTime) / (24 * 60 * 60);
@@ -474,6 +465,10 @@ class OrderService implements OrderServiceInterface
         $days = number_format($roundedValue, 2, '.', '');
         $count = count($rep);
         $result['days'] = $days;
+        $result = [
+            'rows' => $rep->toArray(),
+            'count' => $count,
+        ];
         return Result::success($result);
     }
     /**