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

app/JsonRpc/OrderService.php

@@ -136,9 +136,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'])) {
@@ -297,6 +307,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 表中的记录