update:es

application/services/goods/ElasticService.php

@@ -34,9 +34,7 @@ class ElasticService
      */
     public static function indexDoc($index, $id, $data)
     {
-        $hostStr = config("elasticsearch", "goods.host");
-        $hosts = explode(",", $hostStr);
-        $elasticClient = ElasticUtil::getInstance($hosts);
+        $elasticClient = ElasticUtil::getInstance();
         return $elasticClient->indexDoc($index, $data, $id);
     }
 
@@ -69,24 +67,23 @@ class ElasticService
         var_export($res);
     }
 
-    public static function searchDoc($index)
+    public static function searchDoc($index, $searchContent, $sortType, $from = 0, $size = 10)
     {
-        $elasticClient = ElasticUtil::getInstance();
-
         $data = [
-            'query' => [
-                'match' => [
-                    'test_field' => '中国'
+            "size"=>$size,
+            "from"=>$from,
+            "query" => [
+                "match" => [
+                    "test_field" => "中国"
                 ]
             ],
-            'highlight' => [
-                'pre_tags' => ['<tag1>', '<tag2>'],
-                'post_tags' => ['</tag1>', '</tag2>'],
-                "fields" => [
-                    'test_field' => new \stdClass()
-                ]
+            "sort" => [
+                "match" => [
+                    "test_field" => "中国"
                 ]
+            ],
         ];
+        $elasticClient = ElasticUtil::getInstance();
         $res = $elasticClient->searchDoc($index, $data);
         var_export($res);
     }

application/services/goods/GoodsService.php

@@ -141,8 +141,8 @@ class GoodsService
             "rule_refund" => $skuData["rule_refund"],
             "inventory_total" => $skuData["inventory_total"],
             "inventory_rest" => $skuData["inventory_total"],
-            "original_price" => $skuData["original_price"],
-            "price" => $skuData["price"],
+            "original_price" => $skuData["original_price"] * 100,
+            "price" => $skuData["price"] * 100,
         ];
         if (!empty($skuData["setmeal"])) {
             $skuParams["setmeal"] = $skuData["setmeal"];
@@ -423,7 +423,7 @@ class GoodsService
             $skuParams["setmeal"] = $params["setmeal"];
         }
         //同步到es
-        self::goodsInfoToEs($skuData, $skuParams);
+        self::updateGoodsInfoToEs($skuData, $skuParams);
 
         return GoodsSku::save($skuParams, ["goods_sku_id" => $goodsSkuId]);
     }
@@ -534,24 +534,30 @@ class GoodsService
 
     }
 
+    /**
+     * 更新到es
+     * @param $skuData
+     * @param $skuParams
+     * @return array|callable
+     */
     private static function updateGoodsInfoToEs($skuData, $skuParams)
     {
         $index = "bp_goods";
         $data = [
-            "doc"=>[
+            "doc" => [
                 "id" => $skuData["goods_sku_id"],
                 "goods_pic" => $skuParams["url"],
                 "name" => $skuParams["name"],
                 "inventory_rest" => $skuParams["inventory_rest"],
                 "total_amount_sold" => $skuData["total_amount_sold"],
-                "original_price" => $skuParams["original_price"],
-                "price" => $skuParams["price"],
+                "original_price" => $skuParams["original_price"] / 100,
+                "price" => $skuParams["price"] / 100,
+                "price_sort" => $skuParams["price"],
                 "status" => $skuData["status"],
                 "online_status" => $skuData["online_status"],
             ],
         ];
-        $esRes = ElasticService::updateDoc($index, $skuData["goods_sku_id"], $data);
-        var_dump($esRes);exit;
+        return ElasticService::updateDoc($index, $skuData["goods_sku_id"], $data);
     }
 
     /**
@@ -563,14 +569,15 @@ class GoodsService
     {
         $index = "bp_goods";
         $data = [
-            "doc"=>[
+            "doc" => [
                 "id" => $skuParams["goods_sku_id"],
                 "goods_pic" => $skuParams["url"],
                 "name" => $skuParams["name"],
                 "inventory_rest" => $skuParams["inventory_rest"],
                 "total_amount_sold" => 0,
-                "original_price" => $skuParams["original_price"],
-                "price" => $skuParams["price"],
+                "original_price" => $skuParams["original_price"] / 100,
+                "price" => $skuParams["price"] / 100,
+                "price_sort" => $skuParams["price"],
                 "status" => GoodsSku::STATUS_AUDIT,
                 "online_status" => GoodsSku::ONLINE_STATUS_NO_ONLINE,
             ],

vendor/api/php_utils/src/Elastic/ElasticUtil.php

@@ -20,8 +20,11 @@ final class ElasticUtil
      * ElasticUtil constructor.
      * @param $hosts
      */
-    public function __construct($hosts)
+    public function __construct()
     {
+        $hostStr = config("elasticsearch", "goods.host");
+        $hosts = explode(",", $hostStr);
+        
         $this->client = ClientBuilder::create()->setHosts($hosts)->build();
     }
 
@@ -29,10 +32,10 @@ final class ElasticUtil
      * @param $hosts
      * @return ElasticUtil
      */
-    public static function getInstance($hosts): ElasticUtil
+    public static function getInstance(): ElasticUtil
     {
         if (empty(self::$instance)) {
-            self::$instance = new self($hosts);
+            self::$instance = new self();
         }
         return self::$instance;
     }

vendor/composer/InstalledVersions.php

@@ -32,7 +32,7 @@ private static $installed = array (
     'aliases' => 
     array (
     ),
-    'reference' => 'd4137182c34400313923cd9c6371f57874a58299',
+    'reference' => '84f303fe12b697c338160072ef8b501de5add893',
     'name' => 'yidian/yaf_demo',
   ),
   'versions' => 
@@ -55,7 +55,7 @@ private static $installed = array (
       array (
         0 => '9999999-dev',
       ),
-      'reference' => '94bec4fc5b52829a32f22a40d283faa4f2b596de',
+      'reference' => 'c0936cac091daea86ee8a035a53d3da53c4a6f6e',
     ),
     'catfan/medoo' => 
     array (
@@ -193,7 +193,7 @@ private static $installed = array (
       'aliases' => 
       array (
       ),
-      'reference' => 'd4137182c34400313923cd9c6371f57874a58299',
+      'reference' => '84f303fe12b697c338160072ef8b501de5add893',
     ),
   ),
 );

vendor/composer/installed.json

@@ -33,7 +33,7 @@
             "source": {
                 "type": "git",
                 "url": "https://git.yidian-inc.com:8021/bp/php_utils.git",
-                "reference": "94bec4fc5b52829a32f22a40d283faa4f2b596de"
+                "reference": "c0936cac091daea86ee8a035a53d3da53c4a6f6e"
             },
             "require": {
                 "catfan/medoo": "1.7.10",
@@ -46,7 +46,7 @@
                 "mongodb/mongodb": "1.4.3",
                 "php": ">=7.2"
             },
-            "time": "2021-06-16T09:15:06+00:00",
+            "time": "2021-06-16T10:54:38+00:00",
             "default-branch": true,
             "type": "library",
             "installation-source": "source",

vendor/composer/installed.php

@@ -6,7 +6,7 @@
     'aliases' => 
     array (
     ),
-    'reference' => 'd4137182c34400313923cd9c6371f57874a58299',
+    'reference' => '84f303fe12b697c338160072ef8b501de5add893',
     'name' => 'yidian/yaf_demo',
   ),
   'versions' => 
@@ -29,7 +29,7 @@
       array (
         0 => '9999999-dev',
       ),
-      'reference' => '94bec4fc5b52829a32f22a40d283faa4f2b596de',
+      'reference' => 'c0936cac091daea86ee8a035a53d3da53c4a6f6e',
     ),
     'catfan/medoo' => 
     array (
@@ -167,7 +167,7 @@
       'aliases' => 
       array (
       ),
-      'reference' => 'd4137182c34400313923cd9c6371f57874a58299',
+      'reference' => '84f303fe12b697c338160072ef8b501de5add893',
     ),
   ),
 );