Merge branch 'refs/heads/master' into dev

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

@@ -123,6 +123,14 @@ class StoreOrderDao extends BaseDao
                         ->whereOr('order_id', 'in', $orderIdList);
                 });
             })
+            ->when(isset($where['product_keywords']) && $where['product_keywords'] !== '', function ($query) use ($where) {
+                $query->where(function ($query) use ($where) {
+                    /** @var StoreOrderProductRepository $storeOrderProductRepository */
+                    $storeOrderProductRepository = app()->make(StoreOrderProductRepository::class);
+                    $orderIdList = $storeOrderProductRepository->getOrderIdListByKeyword($where['product_keywords']);
+                    $query->where('order_id', 'in', $orderIdList);
+                });
+            })
             ->when(isset($where['reconciliation_type']) && $where['reconciliation_type'] !== '', function ($query) use ($where) {
                 $query->when($where['reconciliation_type'], function ($query) use ($where) {
                     $query->where('reconciliation_id', '<>', 0);

app/controller/admin/order/Order.php

@@ -65,7 +65,7 @@ class Order extends BaseController
     public function getAllList()
     {
         [$page, $limit] = $this->getPage();
-        $where = $this->request->params(['type', 'date', 'mer_id','keywords','status','username','order_sn','order_ids','paid', 'zero_line_uid']);
+        $where = $this->request->params(['type', 'date', 'mer_id', 'keywords', 'product_keywords', 'status', 'username', 'order_sn', 'order_ids', 'paid', 'zero_line_uid']);
 
         $pay_type=$this->request->param('pay_type');
         if($pay_type==1 || $pay_type==4){