update:es查询优化

application/services/goods/ElasticGoodService.php

@@ -129,22 +129,21 @@ class ElasticGoodService
             "from" => $from,
             "size" => $size,
             "sort" => $sortList[$sortType],
-//            "query" => [
-//                "bool" => [
-//                    "must" => [
-//                        ["term" => ["audit_status" => GoodsSku::STATUS_PASS]],
-//                        ["term" => ["online_status" => GoodsSku::ONLINE_STATUS_ONLINE]],
-//                    ],
-//                ]
-//            ],
         ];
 
         if (!empty($params["search_content"])) {
-            $data["query"]["multi_match"] = [
+            $data["query"]["bool"]["must"]["multi_match"] = [
                 "query" => $params["search_content"],
                 "fields" => ["goods_name", "category_1_name", "category_2_name", "desc", "life_account_name", "shop_name"],
             ];
         }
+
+        // 注意这里顺序，必须 multi_match 在前，term在后
+        $data["query"]["bool"]["must"] = [
+            ["term" => ["audit_status" => GoodsSku::STATUS_PASS]],
+            ["term" => ["online_status" => GoodsSku::ONLINE_STATUS_ONLINE]],
+        ];
+
         $elasticClient = ElasticUtil::getInstance();
         $res = $elasticClient->searchDoc(self::INDEX, $data);