update:调试es查询

application/modules/Cli/controllers/GoodsToEs.php

@@ -71,7 +71,7 @@ class GoodsToEsController extends Cli
             $subShopList = ShopService::getRelationShop($goodsSkuId);
 
             $data = [
-                "id" => $goodsSkuInfo["goods_sku_id"],
+                "goods_sku_id" => $goodsSkuInfo["goods_sku_id"],
                 "goods_desc_pic_url" => $goodsSkuInfo["desc_pic_url"],
                 "goods_name" => $goodsSkuInfo["goods_name"],
                 "inventory_rest" => $goodsSkuInfo["inventory_rest"],

application/services/goods/ElasticGoodService.php

@@ -4,6 +4,7 @@ namespace App\Services\goods;
 
 use Api\PhpUtils\Common\BaseConvert;
 use Api\PhpUtils\Elastic\ElasticUtil;
+use App\Models\goods\mysql\GoodsSku;
 
 class ElasticGoodService
 {
@@ -15,9 +16,9 @@ class ElasticGoodService
         $data = [
             "settings" => [
                 "analysis" => [
-                    "analyzer"=>[
-                        "default"=>[
-                            "type"=>"ik_max_word",
+                    "analyzer" => [
+                        "default" => [
+                            "type" => "ik_max_word",
                         ]
                     ]
                 ]
@@ -128,14 +129,22 @@ 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"]["multi_match"] = [
                 "query" => $params["search_content"],
-                "fields" => ["name", "category_1_name", "category_2_name", "desc"],
-            ]];
+                "fields" => ["goods_name", "category_1_name", "category_2_name", "desc", "life_account_name", "shop_name"],
+            ];
         }
-
         $elasticClient = ElasticUtil::getInstance();
         $res = $elasticClient->searchDoc(self::INDEX, $data);
 
@@ -143,15 +152,20 @@ class ElasticGoodService
         if (!empty($res["hits"]["total"]["value"])) {
             $result["count"] = $res["hits"]["total"]["value"];
             foreach ($res["hits"]["hits"] as $key => $source) {
-                $result["list"][$key]["id"] = BaseConvert::decToOther($source["_source"]["id"]);
-                $result["list"][$key]["goods_pic"] = $source["_source"]["goods_pic"];
-                $result["list"][$key]["name"] = $source["_source"]["name"];
+                $result["list"][$key]["goods_sku_id"] = $source["_source"]["goods_sku_id"];
+                $result["list"][$key]["goods_desc_pic_url"] = $source["_source"]["goods_desc_pic_url"];
+                $result["list"][$key]["goods_name"] = $source["_source"]["goods_name"];
                 $result["list"][$key]["inventory_rest"] = $source["_source"]["inventory_rest"];
                 $result["list"][$key]["total_amount_sold"] = $source["_source"]["total_amount_sold"];
                 $result["list"][$key]["original_price"] = $source["_source"]["original_price"];
                 $result["list"][$key]["price"] = $source["_source"]["price"];
-                $result["list"][$key]["status"] = $source["_source"]["status"];
+                $result["list"][$key]["audit_status"] = $source["_source"]["audit_status"];
                 $result["list"][$key]["online_status"] = $source["_source"]["online_status"];
+                $result["list"][$key]["shop_name"] = $source["_source"]["shop_name"];
+                $result["list"][$key]["shop_longitude"] = $source["_source"]["shop_longitude"];
+                $result["list"][$key]["shop_latitude"] = $source["_source"]["shop_latitude"];
+                $result["list"][$key]["life_account_name"] = $source["_source"]["life_account_name"];
+                $result["list"][$key]["life_account_icon"] = $source["_source"]["life_account_icon"];
             }
         }
         //为避免空数据时候返回给前端错误结构