Merge branch 'rule_googds_limit' into develop

application/services/goods/MarketingPindanGoodsService.php

@@ -146,6 +146,7 @@ class MarketingPindanGoodsService
             "desc_pic_url" => $spuData["desc_pic_url"],
             "desc" => $spuData["desc"],
             "rule_limit" => empty($skuData["rule_limit"]) ? 0 : $skuData["rule_limit"],
+            "rule_googds_limit" => empty($skuData["rule_googds_limit"]) ? 0 : $skuData["rule_googds_limit"],
             "goods_type" => empty($spuData["goods_type"]) ? GoodsSpu::TYPE_ENTITY : $spuData["goods_type"],
             "goods_sub_type" => empty($spuData["goods_sub_type"]) ? GoodsSpu::SUB_TYPE_INSTANT : $spuData["goods_sub_type"],
             "belong_type" => empty($spuData["belong_type"]) ? GoodsSpu::BELONG_TYPE_DISANFANG : $spuData["belong_type"],
@@ -206,6 +207,7 @@ class MarketingPindanGoodsService
             "desc_pic_url" => $skuData["desc_pic_url"],
             "desc" => $skuData["desc"],
             "rule_limit" => empty($skuData["rule_limit"]) ? 0 : $skuData["rule_limit"],
+            "rule_googds_limit" => empty($skuData["rule_googds_limit"]) ? 0 : $skuData["rule_googds_limit"],
             "inventory_total" => $skuData["inventory"],
             "inventory_rest" => $skuData["inventory"],
             "original_price" => empty($skuData["original_price"]) ? "" : $skuData["original_price"] * 100,
@@ -267,6 +269,7 @@ class MarketingPindanGoodsService
             "desc_pic_url" => $params["desc_pic_url"],
             "desc" => $params["desc"],
             "rule_limit" => empty($params["rule_limit"]) ? 0 : $params["rule_limit"],
+            "rule_googds_limit" => empty($params["rule_googds_limit"]) ? 0 : $params["rule_googds_limit"],
         ], ["goods_spu_id" => $goodsSpu["goods_spu_id"]]);
     }
 
@@ -318,6 +321,7 @@ class MarketingPindanGoodsService
             "desc_pic_url" => $params["desc_pic_url"],
             "desc" => $params["desc"],
             "rule_limit" => empty($params["rule_limit"]) ? 0 : $params["rule_limit"],
+            "rule_googds_limit" => empty($params["rule_googds_limit"]) ? 0 : $params["rule_googds_limit"],
             "inventory_total" => $inventoryTotal,
             "ota_id" => empty($params["ota_id"]) ? 0 : $params["ota_id"],
             "inventory_rest" => $inventoryCount,