Merge branch 'test' of https://git.yidian-inc.com:8021/bp/goods into test

application/services/goods/GoodsService.php

@@ -438,6 +438,19 @@ 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;
+                    }
+                }
+
+                //暂不上架
+                if ($online_type == 3) {
+                    $statusData['online_status'] = GoodsSku::ONLINE_STATUS_NO_ONLINE;
+                }
+
                 GoodsSku::save($statusData, ["goods_sku_id" => $sku["goods_sku_id"]]);
 
                 //商品操作记录