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

app/JsonRpc/OrderService.php

@@ -84,7 +84,7 @@ class OrderService implements OrderServiceInterface
             'days' => $days,
         ];
 
-        if (empty($rep)) {
+        if (empty($data['rows'])) {
             return Result::error("暂时没有符合您条件的广告位");
 
         }
@@ -639,8 +639,8 @@ class OrderService implements OrderServiceInterface
         $timestamp = date('YmdHis', $time);
         Db::beginTransaction();
         try {
-            $order = Order::where('id', $data['order_id'])->where('status', 6)->where('edtime', '>=', $timestamp)->update(['status' => 3, 'ad_status' => '3']);
-            $ads = OrderAd::where('order_id', $data['order_id'])->where('status', 6)->where('totime', '>=', $timestamp)->update(['status' => 3]);
+            $order = Order::where('id', $data['order_id'])->where('status', 6)->where('sttime', '>=', $timestamp)->update(['status' => 3, 'ad_status' => '3']);
+            $ads = OrderAd::where('order_id', $data['order_id'])->where('status', 6)->where('fromtime', '>=', $timestamp)->update(['status' => 3]);
             Db::commit();
         } catch (\Exception $e) {
             Db::rollBack();
@@ -663,8 +663,9 @@ class OrderService implements OrderServiceInterface
             0 => 2,
             1 => 3,
             2 => 5,
-            3 => 7,
+            3 => 7
         ];
+        //1：通过；2：驳回；3：撤回；4：修改；5：过期；6：待审核；7：结束；
         date_default_timezone_set('Asia/Shanghai');
         $time = time();
         $timestamp = date('YmdHis', $time);