Merge branch '20241029_fl_order' into dev

app/JsonRpc/OrderService.php

@@ -138,9 +138,19 @@ class OrderService implements OrderServiceInterface
         $perPage = isset($data['pagesize']) ? (int) $data['pagesize'] : 10;
 
         // 构建查询条件
-        $where = [
-            'order.status' => $data['status'], // 明确指定 order 表的 status 列
-        ];
+        $where = [];
+        if(!empty($data['status'])) {
+            $where = [
+                'order.status' => $data['status'], // 明确指定 order 表的 status 列
+            ];
+        } 
+
+        //广告订单状态
+        if(!empty($data['ad_status'])){
+            $where = [
+                'order.ad_status' => $data['ad_status'],
+            ];
+        }
 
         // 添加订单号查询条件
         if (!empty($data['order_num'])) {
@@ -300,6 +310,8 @@ class OrderService implements OrderServiceInterface
         }
         Db::beginTransaction();
         try {
+            Order::where('id', $data['id'])->delete();
+            var_dump(11111111);
             // 获取 order_ad 表中的记录
             OrderAd::where('order_id', $data['id'])->delete();
             // 删除 ad 表中的记录
@@ -506,9 +518,11 @@ class OrderService implements OrderServiceInterface
         $order_size = AdSize::where('id',$data['ad_size_id'])->first();
         // var_dump(($time));
         Db::beginTransaction();
+
         try {
             $order = [
                 'order_num' => $ordernum,
+                'name' => $data['name'],
                 'sttime' => $data['starttime'],
                 'edtime' => $data['endtime'],
                 'user_id' => $data['user_id'],