Merge branch 'goods_init' 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);
         }
@@ -213,7 +213,7 @@ class GoodstoinitController extends Cli
             $desc = $item["desc"];
             $introduce = $item["introduce"];
             $introducePicUrl = $item["productImages"];
-            $expirationTime = $item["outDate"];
+            $expirationTime = empty($item["outDate"]) ? null : $item["outDate"];
             $ruleLimit = $item["canBuy"];
             $ruleDesc = $item["ruleIntroduce"];
             $ruleRefund = empty($item["useRule"]) ? 1 : $item["useRule"];
@@ -223,7 +223,7 @@ class GoodstoinitController extends Cli
             $inventoryTotal = $item["buyCount"];
             $inventoryRest = $item["buyCount"];
             $totalAmountOrder = $item["sellCount"];
-            $originalPrice = $item["price"] * 100;
+            $originalPrice = empty($item["price"]) ? '' : $item["price"] * 100;
             $price = $item["rawPrice"] * 100;
 
             $goodsSpu = GoodsSpu::getRecord(["life_account_id"=>$lifeAccountId, "goods_name"=>$goodsName]);
@@ -247,6 +247,7 @@ class GoodstoinitController extends Cli
             }
 
             $goodsSku = GoodsSku::getRecord(["life_account_id"=>$lifeAccountId, "goods_name"=>$goodsName]);
+
             if (empty($goodsSku)) {
                 $skuParams = [
                     "goods_sku_id" => $goodsSkuId,

application/services/goods/GoodsService.php

@@ -229,7 +229,7 @@ class GoodsService
             "rule_end_time" => empty($skuData["rule_end_time"]) ? "" : $skuData["rule_end_time"],
             "inventory_total" => $skuData["inventory"],
             "inventory_rest" => $skuData["inventory"],
-            "original_price" => empty($skuData["original_price"]) ? 0 : $skuData["original_price"] * 100,
+            "original_price" => empty($skuData["original_price"]) ? '' : $skuData["original_price"] * 100,
             "price" => $skuData["price"] * 100,
         ];
         if (!empty($skuData["setmeal"])) {