update:同步es数据结构调整

application/exception/custom/Code.php

@@ -11,10 +11,11 @@ namespace App\Exception\custom;
  */
 class Code
 {
-    const PARAM =    101000;
-    const SIGN  =    102000;
-    const GOODS =    110000;
-    const SHOP  =    120000;
+    const PARAM = 101000;
+    const SIGN = 102000;
+    const INTERFACE = 103000;
+    const GOODS = 110000;
+    const SHOP = 120000;
     const DISTRIBUTOR = 130000;
     const DISTRIBUTION = 140000;
     const MARKETING = 150000;

application/exception/custom/InterfaceException.php

+<?php
+
+
+namespace App\Exception\custom;
+
+
+use App\Exception\BaseException;
+
+class InterfaceException extends BaseException
+{
+    protected $base_code = Code::INTERFACE;
+
+    protected $cus = [
+        0 => '接口异常',
+        1 => '请求地址异常',
+    ];
+}

application/services/goods/GoodsService.php

@@ -19,6 +19,8 @@ use App\Models\goods\mysql\GoodsSpu;
 use App\Models\goods\mysql\Shop;
 use App\Models\shop\mysql\SubShop;
 use App\Services\shop\ShopService;
+use Api\PhpUtils\Http\Request;
+use App\Exception\custom\InterfaceException;
 
 class GoodsService
 {
@@ -478,6 +480,11 @@ class GoodsService
             GoodsSpu::rollback();
             throw new GoodsException(["cus" => 0]);
         }
+
+        foreach ($goodsSkuList as $sku) {
+            self::updateGoodsInfoToEs($sku["goods_sku_id"]);
+        }
+
         return true;
     }
 
@@ -569,8 +576,6 @@ class GoodsService
         if (!empty($params["setmeal"])) {
             $skuParams["setmeal"] = $params["setmeal"];
         }
-        //同步到es
-        self::updateGoodsInfoToEs($skuData, $skuParams);
 
         //商品操作记录
         $res = self::getSnowIdgenId("goods");
@@ -843,31 +848,49 @@ class GoodsService
 
     /**
      * 更新到es
-     * @param $skuData
-     * @param $skuParams
+     * @param $goodsSkuId
      * @return array|callable
+     * @throws InterfaceException
      */
-    private static function updateGoodsInfoToEs($skuData, $skuParams)
+    private static function updateGoodsInfoToEs($goodsSkuId)
     {
-        $nameList = Category::select("name", ["category_id" => [$skuParams["category_1_id"], $skuParams["category_2_id"]]]);
-        $data = [
-            "doc" => [
-                "id" => $skuData["goods_sku_id"],
-                "goods_desc_pic_url" => $skuParams["desc_pic_url"],
-                "goods_name" => $skuParams["goods_name"],
-                "inventory_rest" => $skuParams["inventory_rest"],
-                "total_amount_sold" => $skuData["total_amount_sold"],
-                "original_price" => $skuParams["original_price"] / 100,
-                "price" => $skuParams["price"] / 100,
-                "price_sort" => (int)$skuParams["price"],
-                "audit_status" => $skuData["audit_status"],
-                "online_status" => $skuData["online_status"],
-                "desc" => $skuData["desc"],
-                "category_1_name" => $nameList[0],
-                "category_2_name" => $nameList[1],
-            ],
-        ];
-        return ElasticGoodService::updateDoc($skuData["goods_sku_id"], $data);
+        $goodsSkuInfoList = GoodsSku::getRecordMaster(["goods_sku_id" => $goodsSkuId]);
+        if (!empty($goodsSkuInfoList)) {
+            $goodsSkuInfo = $goodsSkuInfoList[0];
+            $nameList = Category::select("name", ["category_id" => [$goodsSkuInfo["category_1_id"], $goodsSkuInfo["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" => $goodsSkuInfo["life_account_id"]]);
+            //门店信息
+            $subShopList = ShopService::getRelationShop($goodsSkuId);
+
+            $data = [
+                "doc" => [
+                    "id" => $goodsSkuInfo["goods_sku_id"],
+                    "goods_desc_pic_url" => $goodsSkuInfo["desc_pic_url"],
+                    "goods_name" => $goodsSkuInfo["goods_name"],
+                    "inventory_rest" => $goodsSkuInfo["inventory_rest"],
+                    "total_amount_sold" => $goodsSkuInfo["total_amount_sold"],
+                    "original_price" => $goodsSkuInfo["original_price"] / 100,
+                    "price" => $goodsSkuInfo["price"] / 100,
+                    "price_sort" => (int)$goodsSkuInfo["price"],
+                    "audit_status" => $goodsSkuInfo["audit_status"],
+                    "online_status" => $goodsSkuInfo["online_status"],
+                    "desc" => $goodsSkuInfo["desc"],
+                    "category_1_name" => $nameList[0],
+                    "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"],
+                    "shop_name" => empty($subShopList[0]["shop_name"]) ? "" : $subShopList[0]["shop_name"],
+                    "shop_longitude" => empty($subShopList[0]["longitude"]) ? "" : $subShopList[0]["longitude"],
+                    "shop_latitude" => empty($subShopList[0]["latitude"]) ? "" : $subShopList[0]["latitude"],
+                ],
+            ];
+            return ElasticGoodService::updateDoc($goodsSkuId, $data);
+        }
     }
 
     /**
@@ -1008,7 +1031,7 @@ class GoodsService
 
         return $data;
     }
-    
+
     /**
      * 获取 GoodsSku 列表
      * @param $params