Merge branch 'online_time' into test

application/services/goods/GoodsService.php

@@ -583,6 +583,10 @@ class GoodsService
         if (!empty($goodsSkuList)) {
             foreach ($goodsSkuList as $sku) {
 
+                if ($sku["expiration_time"] < date("Y-m-d H:i:s")) {
+                    throw new GoodsException(["cus" => 30]);
+                }
+
                 $goodsSkuId = $sku["goods_sku_id"];
                 $goodsSkuData = [
                     "online_type" => $onlineType,
@@ -611,6 +615,7 @@ class GoodsService
 
                 //立即上架和定时上架
                 if (in_array($onlineType, [1,2])) {
+
                     if ($sku["expiration_time"] <= $goodsSkuData['online_start_time']) {
                         throw new GoodsException(["cus" => 52]);
                     }