Skip to content

G
goods
Commit 9c5d3a3e authored by jianghaiming's avatar jianghaiming
Browse files
Options

Merge branch 'rule_googds_limit' into develop

parents 3dc041af 4b079c3a
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
application/services/goods/MarketingPindanGoodsService.php
View file @ 9c5d3a3e
...@@ -146,6 +146,7 @@ class MarketingPindanGoodsService ...@@ -146,6 +146,7 @@ class MarketingPindanGoodsService
"desc_pic_url" => $spuData["desc_pic_url"], "desc_pic_url" => $spuData["desc_pic_url"],
"desc" => $spuData["desc"], "desc" => $spuData["desc"],
"rule_limit" => empty($skuData["rule_limit"]) ? 0 : $skuData["rule_limit"], "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_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"], "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"], "belong_type" => empty($spuData["belong_type"]) ? GoodsSpu::BELONG_TYPE_DISANFANG : $spuData["belong_type"],
...@@ -206,6 +207,7 @@ class MarketingPindanGoodsService ...@@ -206,6 +207,7 @@ class MarketingPindanGoodsService
"desc_pic_url" => $skuData["desc_pic_url"], "desc_pic_url" => $skuData["desc_pic_url"],
"desc" => $skuData["desc"], "desc" => $skuData["desc"],
"rule_limit" => empty($skuData["rule_limit"]) ? 0 : $skuData["rule_limit"], "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_total" => $skuData["inventory"],
"inventory_rest" => $skuData["inventory"], "inventory_rest" => $skuData["inventory"],
"original_price" => empty($skuData["original_price"]) ? "" : $skuData["original_price"] * 100, "original_price" => empty($skuData["original_price"]) ? "" : $skuData["original_price"] * 100,
...@@ -267,6 +269,7 @@ class MarketingPindanGoodsService ...@@ -267,6 +269,7 @@ class MarketingPindanGoodsService
"desc_pic_url" => $params["desc_pic_url"], "desc_pic_url" => $params["desc_pic_url"],
"desc" => $params["desc"], "desc" => $params["desc"],
"rule_limit" => empty($params["rule_limit"]) ? 0 : $params["rule_limit"], "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"]]); ], ["goods_spu_id" => $goodsSpu["goods_spu_id"]]);
} }
...@@ -318,6 +321,7 @@ class MarketingPindanGoodsService ...@@ -318,6 +321,7 @@ class MarketingPindanGoodsService
"desc_pic_url" => $params["desc_pic_url"], "desc_pic_url" => $params["desc_pic_url"],
"desc" => $params["desc"], "desc" => $params["desc"],
"rule_limit" => empty($params["rule_limit"]) ? 0 : $params["rule_limit"], "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, "inventory_total" => $inventoryTotal,
"ota_id" => empty($params["ota_id"]) ? 0 : $params["ota_id"], "ota_id" => empty($params["ota_id"]) ? 0 : $params["ota_id"],
"inventory_rest" => $inventoryCount, "inventory_rest" => $inventoryCount,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment