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

application/modules/Cli/controllers/Goodstoinit.php

@@ -30,7 +30,7 @@ class GoodstoinitController extends Cli
             echo $i . "\n";
             $list = $this->getDataList($i, $pageSize);
             //处理 shop 数据
-            $this->dealShopData($list);
+//            $this->dealShopData($list);
             //处理商品数据
             $this->dealGoodsData($list);
         }
@@ -277,6 +277,14 @@ class GoodstoinitController extends Cli
                     "is_import" => 1,
                 ];
                 GoodsSku::save($skuParams);
+            } else {
+                $skuParams = [
+                    "inventory_total" => $inventoryTotal,
+                    "inventory_rest" => $inventoryRest,
+                    "total_amount_order" => $totalAmountOrder,
+                    "total_amount_sold" => $totalAmountOrder,
+                ];
+                GoodsSku::save($skuParams, ["goods_sku_id"=>$goodsSku["goods_sku_id"]]);
             }
 
 

vendor/api/php_utils/src/Common/GoodsSkuId.php

@@ -11,14 +11,16 @@ class GoodsSkuId
      * category_1_id 一级分类的id，两位，不足两位在十位补零
      * category_2_id 二级分类的id，两位，不足三位在百位补零
      * spu 商品类型，1虚拟商品，2实体商品
+     * goodsType 1、（默认）第三方商品 2、自营商品
      *
      * @param $id
      * @param $category1Id
      * @param $category2Id
      * @param $spuType
+     * @param $goodsType
      * @return string
      */
-    public static function generateGoodSkuId($id, $category1Id, $category2Id, $spuType)
+    public static function generateGoodSkuId($id, $category1Id, $category2Id, $spuType, $goodsType = 1)
     {
         if (strlen($category1Id) == 1) {
             $category1Id = "0" . $category1Id;
@@ -26,7 +28,7 @@ class GoodsSkuId
         if (strlen($category2Id) == 2) {
             $category2Id = "0" . $category2Id;
         }
-        $idStr = $id . $category1Id . $category2Id . $spuType;
+        $idStr = $id . $category1Id . $category2Id . $spuType . $goodsType;
         //转62进制
         $tmp = BaseConvert::decToOther($idStr);