Commit 48b38aae authored by jianghaiming's avatar jianghaiming

Merge branch 'online_time' into test

parents a0bb9ec9 13bdfa82
......@@ -449,7 +449,7 @@ class GoodsService
if ($online_type == 2) {
$onlineStartTime = empty($sku["online_start_time"]) ? 0 : strtotime($sku["online_start_time"]);
if ($onlineStartTime > time()) {
$statusData['online_status'] = GoodsSku::ONLINE_STATUS_NO_ONLINE;
$statusData['online_status'] = GoodsSku::ONLINE_STATUS_OFFLINE;
}
}
......@@ -595,7 +595,7 @@ class GoodsService
];
if ($onlineType == 1) {
if ($sku['audit_status'] == 1) {
$goodsSkuData['online_status'] = 1;
$goodsSkuData['online_status'] = GoodsSku::ONLINE_STATUS_ONLINE;
}
$goodsSkuData['online_start_time'] = date("Y-m-d H:i:s");
}
......@@ -603,13 +603,13 @@ class GoodsService
//暂不上架
if ($onlineType == 3) {
//$goodsSkuData['audit_status'] = 0;
$goodsSkuData['online_status'] = 0;
$goodsSkuData['online_status'] = GoodsSku::ONLINE_STATUS_OFFLINE;
}
if ($onlineType == 2) {
$onlineStartTime = strtotime($goodsSkuData['online_start_time']);
if ($onlineStartTime > time()) {
$goodsSkuData['online_status'] = 0;
$goodsSkuData['online_status'] = GoodsSku::ONLINE_STATUS_OFFLINE;
}
}
......
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