Merge branch '20241029_fl_order' of https://gitee.com/zxt_5/order_producer into 20241029_fl_order

app/JsonRpc/OrderService.php

@@ -57,12 +57,12 @@ 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','ad_size.*')
+                    ->leftJoin('ad_size', 'ad_place.ad_size_id', 'ad_size.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')
-                    ->selectSub('ad_size.height','size_height')
+                    ->selectSub('ad_size.width', 'size_width')
+                    ->selectSub('ad_size.height', 'size_height')
                     ->orderBy("website.id", "asc")
                     ->limit($data['pageSize'])
                     ->offset(($data['page'] - 1) * $data['pageSize'])
@@ -71,12 +71,12 @@ class OrderService implements OrderServiceInterface
             } else {
                 $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','ad_size.*')
+                    ->leftJoin('ad_size', 'ad_place.ad_size_id', 'ad_size.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')
-                    ->selectSub('ad_size.height','size_height')
+                    ->selectSub('ad_size.width', 'size_width')
+                    ->selectSub('ad_size.height', 'size_height')
                     ->orderBy("website.id", "asc")
                     ->limit($data['pageSize'])
                     ->offset(($data['page'] - 1) * $data['pageSize'])
@@ -187,7 +187,7 @@ class OrderService implements OrderServiceInterface
                 'admin_user.user_name as admin_user_name',
                 'user.user_name as user_name'
             )
-            ->orderBy('order.id');
+            ->orderBy('order.id', 'desc');
 
         // 执行分页查询
         $result = $query->paginate($perPage, ['*'], 'page', $page);
@@ -440,14 +440,14 @@ class OrderService implements OrderServiceInterface
             }
             //去掉时间冲突并且符合图片尺寸的广告位
             $placeids = AdPlace::whereNotIn('id', $pid)->where($where)->select('id', 'website_id')->get()->all();
-           if(empty($placeids)){
+            if (empty($placeids)) {
                 return Result::error('暂无数据！');
             }
             if (!isset($data['website_id'])) {
                 $websiteIds = array_column($placeids, 'website_id');
                 $website_id = array_unique($websiteIds);
                 $rep = Website::whereIn('id', $website_id)->get();
-                $count  = Website::whereIn('id', $website_id)->count();
+                $count = Website::whereIn('id', $website_id)->count();
                 //若不存在网站id参数直接返回符合条件的广告位相关联的网站名称
             } else {
                 $place_id = [];
@@ -458,12 +458,12 @@ class OrderService implements OrderServiceInterface
                     ->whereIn('ad_place.id', $place_id)
                     ->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','ad_size.*')
+                    ->leftJoin('ad_size', 'ad_place.ad_size_id', 'ad_size.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')
-                    ->selectSub('ad_size.height','size_height')
+                    ->selectSub('ad_size.width', 'size_width')
+                    ->selectSub('ad_size.height', 'size_height')
                     ->orderBy("website.id", "asc")
                     ->limit($data['pageSize'])
                     ->offset(($data['page'] - 1) * $data['pageSize'])
@@ -477,12 +477,12 @@ class OrderService implements OrderServiceInterface
                 $rep = AdPlace::where($where)
                     ->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','ad_size.*')
+                    ->leftJoin('ad_size', 'ad_place.ad_size_id', 'ad_size.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')
-                    ->selectSub('ad_size.height','size_height')
+                    ->selectSub('ad_size.width', 'size_width')
+                    ->selectSub('ad_size.height', 'size_height')
                     ->orderBy("website.id", "asc")
                     ->limit($data['pageSize'])
                     ->offset(($data['page'] - 1) * $data['pageSize'])
@@ -510,7 +510,7 @@ class OrderService implements OrderServiceInterface
         $result = [
             'rows' => $rep->toArray(),
             'count' => $count,
-            'days' => $days
+            'days' => $days,
         ];
         return Result::success($result);
     }