Skip to content

G
goods
Commit e5591958 authored by luhongguang's avatar luhongguang
Browse files
Options

update:es数据结构修改

parent 9750a7c5
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 45 deletions
application/modules/Cli/controllers/GoodsToEs.php
View file @ e5591958
...@@ -70,27 +70,30 @@ class GoodsToEsController extends Cli ...@@ -70,27 +70,30 @@ class GoodsToEsController extends Cli
//门店信息 //门店信息
$subShopList = ShopService::getRelationShop($goodsSkuId); $subShopList = ShopService::getRelationShop($goodsSkuId);
$data = [ $latitude = empty($subShopList[0]["latitude"]) ? "" : $subShopList[0]["latitude"];
"goods_sku_id" => $goodsSkuInfo["goods_sku_id"], $longitude = empty($subShopList[0]["longitude"]) ? "" : $subShopList[0]["longitude"];
"goods_desc_pic_url" => $goodsSkuInfo["desc_pic_url"], if (!empty($longitude) || !empty($latitude)) {
"goods_name" => $goodsSkuInfo["goods_name"], $data = [
"inventory_rest" => $goodsSkuInfo["inventory_rest"], "goods_sku_id" => $goodsSkuInfo["goods_sku_id"],
"total_amount_sold" => $goodsSkuInfo["total_amount_sold"], "goods_desc_pic_url" => $goodsSkuInfo["desc_pic_url"],
"original_price" => $goodsSkuInfo["original_price"] / 100, "goods_name" => $goodsSkuInfo["goods_name"],
"price" => $goodsSkuInfo["price"] / 100, "inventory_rest" => $goodsSkuInfo["inventory_rest"],
"price_sort" => (int)$goodsSkuInfo["price"], "total_amount_sold" => $goodsSkuInfo["total_amount_sold"],
"audit_status" => $goodsSkuInfo["audit_status"], "original_price" => $goodsSkuInfo["original_price"] / 100,
"online_status" => $goodsSkuInfo["online_status"], "price" => $goodsSkuInfo["price"] / 100,
"desc" => $goodsSkuInfo["desc"], "price_sort" => (int)$goodsSkuInfo["price"],
"category_1_name" => $nameList[0], "audit_status" => $goodsSkuInfo["audit_status"],
"category_2_name" => $nameList[1], "online_status" => $goodsSkuInfo["online_status"],
"life_account_name" => empty($lifeAccountRes["response"]["result"]["life_account_name"]) ? "" : $lifeAccountRes["response"]["result"]["life_account_name"], "desc" => $goodsSkuInfo["desc"],
"life_account_icon" => empty($lifeAccountRes["response"]["result"]["life_account_icon"]) ? "" : $lifeAccountRes["response"]["result"]["life_account_icon"], "category_1_name" => $nameList[0],
"shop_name" => empty($subShopList[0]["shop_name"]) ? "" : $subShopList[0]["shop_name"], "category_2_name" => $nameList[1],
"shop_longitude" => empty($subShopList[0]["longitude"]) ? "" : $subShopList[0]["longitude"], "life_account_name" => empty($lifeAccountRes["response"]["result"]["life_account_name"]) ? "" : $lifeAccountRes["response"]["result"]["life_account_name"],
"shop_latitude" => empty($subShopList[0]["latitude"]) ? "" : $subShopList[0]["latitude"], "life_account_icon" => empty($lifeAccountRes["response"]["result"]["life_account_icon"]) ? "" : $lifeAccountRes["response"]["result"]["life_account_icon"],
]; "shop_name" => empty($subShopList[0]["shop_name"]) ? "" : $subShopList[0]["shop_name"],
return ElasticGoodService::indexDoc($goodsSkuId, $data); "shop_location" => $latitude.",".$longitude,
];
return ElasticGoodService::indexDoc($goodsSkuId, $data);
}
} }
} }
......
application/services/goods/ElasticGoodService.php
View file @ e5591958
...@@ -49,6 +49,9 @@ class ElasticGoodService ...@@ -49,6 +49,9 @@ class ElasticGoodService
'type' => 'text', 'type' => 'text',
'analyzer' => 'ik_max_word', 'analyzer' => 'ik_max_word',
], ],
'shop_location' => [
'type' => 'geo_point',
],
] ]
] ]
]; ];
......
application/services/goods/GoodsService.php
View file @ e5591958
...@@ -914,29 +914,34 @@ class GoodsService ...@@ -914,29 +914,34 @@ class GoodsService
//门店信息 //门店信息
$subShopList = ShopService::getRelationShop($goodsSkuId); $subShopList = ShopService::getRelationShop($goodsSkuId);
$data = [ if (!empty($subShopList)) {
"doc" => [ foreach ($subShopList as $subShop) {
"id" => $goodsSkuInfo["goods_sku_id"], if (!empty($subShop["latitude"]) && !empty($subShop["longitude"])) {
"goods_desc_pic_url" => $goodsSkuInfo["desc_pic_url"], $data = [
"goods_name" => $goodsSkuInfo["goods_name"], "doc" => [
"inventory_rest" => $goodsSkuInfo["inventory_rest"], "goods_sku_id" => $goodsSkuInfo["goods_sku_id"],
"total_amount_sold" => $goodsSkuInfo["total_amount_sold"], "goods_desc_pic_url" => $goodsSkuInfo["desc_pic_url"],
"original_price" => $goodsSkuInfo["original_price"] / 100, "goods_name" => $goodsSkuInfo["goods_name"],
"price" => $goodsSkuInfo["price"] / 100, "inventory_rest" => $goodsSkuInfo["inventory_rest"],
"price_sort" => (int)$goodsSkuInfo["price"], "total_amount_sold" => $goodsSkuInfo["total_amount_sold"],
"audit_status" => $goodsSkuInfo["audit_status"], "original_price" => $goodsSkuInfo["original_price"] / 100,
"online_status" => $goodsSkuInfo["online_status"], "price" => $goodsSkuInfo["price"] / 100,
"desc" => $goodsSkuInfo["desc"], "price_sort" => (int)$goodsSkuInfo["price"],
"category_1_name" => $nameList[0], "audit_status" => $goodsSkuInfo["audit_status"],
"category_2_name" => $nameList[1], "online_status" => $goodsSkuInfo["online_status"],
"life_account_name" => empty($lifeAccountRes["response"]["result"]["life_account_name"]) ? "" : $lifeAccountRes["response"]["result"]["life_account_name"], "desc" => $goodsSkuInfo["desc"],
"life_account_icon" => empty($lifeAccountRes["response"]["result"]["life_account_icon"]) ? "" : $lifeAccountRes["response"]["result"]["life_account_icon"], "category_1_name" => $nameList[0],
"shop_name" => empty($subShopList[0]["shop_name"]) ? "" : $subShopList[0]["shop_name"], "category_2_name" => $nameList[1],
"shop_longitude" => empty($subShopList[0]["longitude"]) ? "" : $subShopList[0]["longitude"], "life_account_name" => empty($lifeAccountRes["response"]["result"]["life_account_name"]) ? "" : $lifeAccountRes["response"]["result"]["life_account_name"],
"shop_latitude" => empty($subShopList[0]["latitude"]) ? "" : $subShopList[0]["latitude"], "life_account_icon" => empty($lifeAccountRes["response"]["result"]["life_account_icon"]) ? "" : $lifeAccountRes["response"]["result"]["life_account_icon"],
], "shop_name" => empty($subShopList[0]["shop_name"]) ? "" : $subShopList[0]["shop_name"],
]; "shop_location" => $subShop["latitude"].",".$subShop["longitude"],
return ElasticGoodService::updateDoc($goodsSkuId, $data); ],
];
ElasticGoodService::updateDoc($goodsSkuId, $data);
}
}
}
} }
} }
...@@ -948,8 +953,15 @@ class GoodsService ...@@ -948,8 +953,15 @@ class GoodsService
private static function addGoodsInfoToEs($skuParams) private static function addGoodsInfoToEs($skuParams)
{ {
$nameList = Category::select("name", ["category_id" => [$skuParams["category_1_id"], $skuParams["category_2_id"]]]); $nameList = Category::select("name", ["category_id" => [$skuParams["category_1_id"], $skuParams["category_2_id"]]]);
//生活号信息
$url = config('interface', 'goods.public.get_life_account_by_id');
if (empty($url)) {
throw new InterfaceException(['cus' => 0]);
}
$lifeAccountRes = (new Request())->get($url, ["life_account_id" => $skuParams["life_account_id"]]);
$data = [ $data = [
"id" => $skuParams["goods_sku_id"], "goods_sku_id" => $skuParams["goods_sku_id"],
"goods_desc_pic_url" => $skuParams["desc_pic_url"], "goods_desc_pic_url" => $skuParams["desc_pic_url"],
"goods_name" => $skuParams["goods_name"], "goods_name" => $skuParams["goods_name"],
"inventory_rest" => $skuParams["inventory_rest"], "inventory_rest" => $skuParams["inventory_rest"],
...@@ -962,6 +974,8 @@ class GoodsService ...@@ -962,6 +974,8 @@ class GoodsService
"desc" => $skuParams["desc"], "desc" => $skuParams["desc"],
"category_1_name" => $nameList[0], "category_1_name" => $nameList[0],
"category_2_name" => $nameList[1], "category_2_name" => $nameList[1],
"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"],
]; ];
$esRes = ElasticGoodService::indexDoc($skuParams["goods_sku_id"], $data); $esRes = ElasticGoodService::indexDoc($skuParams["goods_sku_id"], $data);
if ($esRes["result"] == "created" && $esRes["_shards"]["successful"] == 1) { if ($esRes["result"] == "created" && $esRes["_shards"]["successful"] == 1) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment