Merge remote-tracking branch 'origin/dev' into dev

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

@@ -5064,6 +5064,16 @@ class StoreOrderRepository extends BaseRepository
     {
         $where['paid'] = 1;
         $query = $this->dao->search($where, null);
+        $kw = trim($where['product_keywords'] ?? '');//从where取出去除空格
+        if ($kw !== '') {
+            $ids =Db::name('store_order_product')
+                ->whereRaw("JSON_UNQUOTE(JSON_EXTRACT(cart_info, '$.product.store_name')) LIKE ?", ["%{$kw}%"])
+                ->column('order_id');
+            if (empty($ids)) {
+                return ['count' => 0, 'list' => []];
+            }
+            $query->whereIn('order_id', $ids);
+        }
         $count = $query->count();
         $list = $query->with([
             'orderProduct', 'merchant' => function ($query) {
@@ -5125,6 +5135,15 @@ class StoreOrderRepository extends BaseRepository
                     return $query->field('uid,phone,nickname');
                 }
             ]);
+
+        $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);
 

app/controller/admin/order/Order.php

@@ -33,8 +33,10 @@ class Order extends BaseController
     {
         [$page, $limit] = $this->getPage();
         $where = $this->request->params(['date','order_sn','order_type','keywords','username']);
+        $productKeywords = $this->request->param('product_keywords');//商品关键字
         $where['reconciliation_type'] = $this->request->param('status', 1);
         $where['mer_id'] = $id;
+        $where['product_keywords'] = $productKeywords;
         return app('json')->success($this->repository->adminGetList($where, $page, $limit));
     }