1

app/JsonRpc/OrderService.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace App\JsonRpc;
 
 use App\Model\Ad;
@@ -168,6 +169,16 @@ class OrderService implements OrderServiceInterface
         if (!empty($data['order_num'])) {
             $where['order.order_num'] = $data['order_num']; // 明确指定 order 表的 order_num 列
         }
+        $where1 = [];
+        //nickname like
+        if (!empty($data['user_name'])) {
+            $where1[] = ['user.nickname', 'like', '%' . $data['user_name'] . '%'];
+        }
+
+        //website_name
+        if (!empty($data['website_name'])) {
+            $where[] = ['website.website_name', 'like', '%' . $data['website_name'] . '%'];
+        }
 
         // 处理时间范围查询
         $start = $data['sttime'] ?? '';
@@ -184,12 +195,17 @@ class OrderService implements OrderServiceInterface
             ->when(!empty($end), function ($q) use ($end) {
                 $q->where('order.totime', '<=', $end); // 明确指定 order 表的 totime 列
             })
+            ->when(!empty($where1), function ($q) use ($where1) {
+                $q->where($where1); // 明确指定 user 表的 nickname 列
+            })
             ->leftJoin('user as admin_user', 'order.admin_user_id', '=', 'admin_user.id')
             ->leftJoin('user as user', 'order.user_id', '=', 'user.id')
+            ->leftJoin('website', 'order.website_id', '=', 'website.id')
             ->select(
                 'order.*',
                 'admin_user.user_name as admin_user_name',
-                'user.user_name as user_name'
+                'user.nickname as user_name',
+                'website.website_name as website_name'
             )
             ->orderBy('order.id', 'desc');
 
@@ -917,7 +933,6 @@ class OrderService implements OrderServiceInterface
         } else {
             return Result::success($shopping_id);
         }
-
     }
     /**
      * 获取购物车中的广告位
@@ -978,7 +993,6 @@ class OrderService implements OrderServiceInterface
         } else {
             return Result::success($result);
         }
-
     }
     /**
      * 删除购物车中的广告位