Commit ab0e4c3f authored by jianghaiming's avatar jianghaiming

Merge branch 'online_time' into test

parents c60b5d75 8735a3cc
......@@ -817,16 +817,16 @@ class GoodsService
$skuParams["setmeal"] = $params["setmeal"];
}
if (!empty($skuData["online_start_time"])) {
$skuParams['online_start_time'] = empty($skuData["online_start_time"]) ? "" : $skuData["online_start_time"];
if (!empty($params["online_start_time"])) {
$skuParams['online_start_time'] = empty($params["online_start_time"]) ? "" : $params["online_start_time"];
}
if (!empty($skuData["online_end_time"])) {
$skuParams['online_end_time'] = empty($skuData["online_end_time"]) ? "" : $skuData["online_end_time"];
if (!empty($params["online_end_time"])) {
$skuParams['online_end_time'] = empty($params["online_end_time"]) ? "" : $params["online_end_time"];
}
if (!empty($skuData["online_type"])) {
$skuParams['online_type'] = empty($skuData["online_type"]) ? "" : $skuData["online_type"];
if (!empty($params["online_type"])) {
$skuParams['online_type'] = empty($params["online_type"]) ? 0 : $params["online_type"];
}
//商品操作记录
......
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