Merge branch 'develop' of https://gitlab.yidian-inc.com/bp/goods into develop

application/modules/Cli/controllers/GoodsToEs.php

@@ -95,6 +95,7 @@ class GoodsToEsController extends Cli
                         "life_account_name" => empty($lifeAccountRes["response"]["result"]["life_account_name"]) ? "" : $lifeAccountRes["response"]["result"]["life_account_name"],
                         "life_account_icon" => empty($lifeAccountRes["response"]["result"]["life_account_icon"]) ? "" : $lifeAccountRes["response"]["result"]["life_account_icon"],
                         "shop_name" => $subShop["shop_name"],
+                        "shop_address" => $subShop["address"],
                         "shop_location" => $latitude.",".$longitude,
                         "update_time" => strtotime($goodsSkuInfo["update_time"]),
                     ];

application/services/goods/ElasticGoodService.php

@@ -149,6 +149,7 @@ class ElasticGoodService
                 $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_address"] = $source["_source"]["shop_address"];
                 $result["list"][$key]["shop_location"] = $source["_source"]["shop_location"];
                 $result["list"][$key]["life_account_id"] = $source["_source"]["life_account_id"];
                 $result["list"][$key]["life_account_name"] = $source["_source"]["life_account_name"];
@@ -234,7 +235,7 @@ class ElasticGoodService
         if (!empty($searchContent) || (!empty($subjectName) && $subjectName != "本周上新")) {
             $multiMatch = [["multi_match" => [
                 "query" => $searchContent.$subjectName,
-                "fields" => ["goods_name", "category_1_name", "category_2_name", "desc", "life_account_name", "shop_name"],
+                "fields" => ["goods_name", "category_1_name", "category_2_name", "desc", "life_account_name", "shop_name", "shop_address"],
             ]]];
 
             $data["query"]["bool"]["must"] = array_merge($mustInit, $multiMatch);

application/services/goods/GoodsService.php

@@ -1012,6 +1012,7 @@ class GoodsService
                                 "life_account_name" => empty($lifeAccountRes["response"]["result"]["life_account_name"]) ? "" : $lifeAccountRes["response"]["result"]["life_account_name"],
                                 "life_account_icon" => empty($lifeAccountRes["response"]["result"]["life_account_icon"]) ? "" : $lifeAccountRes["response"]["result"]["life_account_icon"],
                                 "shop_name" => $subShop["shop_name"],
+                                "shop_address" => $subShop["address"],
                                 "shop_location" => $subShop["latitude"].",".$subShop["longitude"],
                                 "update_time" => strtotime($goodsSkuInfo["update_time"]),
                             ],