平台后台-订单列表-支持关键字搜索订单数据

app/common/dao/store/order/StoreOrderDao.php

@@ -15,6 +15,7 @@ use app\common\dao\BaseDao;
 use app\common\model\BaseModel;
 use app\common\model\store\order\StoreOrder;
 use app\common\model\user\User;
+use app\common\repositories\store\order\StoreOrderProductRepository;
 use app\common\repositories\user\UserRepository;
 use app\entity\CommonEntity;
 use app\entity\data\store\StoreOrderEntity;
@@ -110,10 +111,14 @@ class StoreOrderDao extends BaseDao
             })
             ->when(isset($where['keywords']) && $where['keywords'] !== '', function ($query) use ($where) {
                 $query->where(function ($query) use ($where) {
+                    /** @var StoreOrderProductRepository $storeOrderProductRepository */
+                    $storeOrderProductRepository = app()->make(StoreOrderProductRepository::class);
+                    $orderIdList = $storeOrderProductRepository->getOrderIdListByKeyword($where['keywords']);
                     $query->where('real_name', 'like', "%" . $where['keywords'] . "%")
                         ->whereOr('user_phone', 'like', "%{$where['keywords']}%")
                         ->whereOr('order_sn', 'like', '%' . $where['keywords'] . '%')
-                        ->whereOr('verify_code', 'like', '%' . $where['keywords'] . '%');
+                        ->whereOr('verify_code', 'like', '%' . $where['keywords'] . '%')
+                        ->whereOr('order_id', 'in', $orderIdList);
                 });
             })
             ->when(isset($where['reconciliation_type']) && $where['reconciliation_type'] !== '', function ($query) use ($where) {

app/common/repositories/store/order/StoreOrderRepository.php

@@ -5141,20 +5141,6 @@ class StoreOrderRepository extends BaseRepository
                     return $query->field('uid,phone,nickname');
                 }
             ]);
-        if (!empty($where['keywords'])) {
-            /** @var StoreOrderProductRepository $storeOrderProductRepository */
-            $storeOrderProductRepository = app()->make(StoreOrderProductRepository::class);
-            $orderIdList = $storeOrderProductRepository->getOrderIdListByKeyword($where['keywords']);
-            $query->whereIn('order_id', $orderIdList);
-        }
-        $kw = trim($where['product_keywords'] ?? '');
-        if ($kw !== '') {
-            $ids = Db::name('store_order_product')
-                ->whereRaw("JSON_UNQUOTE(JSON_EXTRACT(cart_info, '$.product.store_name')) LIKE ?", ["%{$kw}%"]) 
-                ->column('order_id');
-            $ids = $ids ?: [-1];
-            $query->whereIn('order_id', $ids);
-        }
         $query1 = clone ($query);
         $query2 = clone ($query);