Merge branch 'online_time' into develop

application/services/goods/GoodsService.php

@@ -429,25 +429,27 @@ class GoodsService
                     ];
                 }
 
-                $online_type = empty($skuData["online_type"]) ? 0 : $skuData["online_type"];
+                $online_type = empty($sku["online_type"]) ? 0 : $sku["online_type"];
 
-                switch ($online_type) {
-                    case 1:
-                        $statusData['online_status'] = 1;
-                        break;
-                    case 2:
-                        $statusData['online_status'] = 0;
-                        $statusData['online_start_time'] =  empty($skuData["online_start_time"]) ? "" : $skuData["online_start_time"];
-                        $statusData['online_end_time'] =  empty($skuData["online_end_time"]) ? "" : $skuData["online_end_time"];
-                        break;
-                    case 3:
-                        $statusData['online_status'] = 0;
-                        break;
-                    default:
-                        # code...
-                        break;
+                if ($online_type == 1) {
+                    if ($status == GoodsSku::STATUS_PASS) {
+                        $statusData['online_status'] = GoodsSku::ONLINE_STATUS_ONLINE;
+                        $statusData['online_start_time'] = date("Y-m-d H:i:s");
+                    }
+                }
+                
+                //定点上架
+                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"]]);
 
@@ -579,9 +581,25 @@ class GoodsService
                     "online_end_time" => $onlineEndTime
                 ];
                 if ($onlineType == 1) {
+                    if ($sku['audit_status'] == 1) {
+                        $goodsSkuData['online_status'] = 1;
+                    }
                     $goodsSkuData['online_start_time'] = date("Y-m-d H:i:s");
                 }
                 
+                //暂不上架
+                if ($onlineType == 3) {
+                    //$goodsSkuData['audit_status'] = 0;
+                    $goodsSkuData['online_status'] = 0;
+                }
+
+                if ($onlineType == 2) {
+                    $onlineStartTime = strtotime($goodsSkuData['online_start_time']);
+                    if ($onlineStartTime > time()) {
+                        $goodsSkuData['online_status'] = 0;
+                    }
+                }
+                
                 GoodsSku::save($goodsSkuData, ["goods_sku_id" => $goodsSkuId]);
                 //上架的话，生成快照
                 self::addGoodsSnapshot($sku);
@@ -1191,7 +1209,7 @@ class GoodsService
         $where['ORDER'] = ["create_time" => "DESC"];
 
         $list = GoodsSku::select(["goods_spu_id", "goods_sku_id", "goods_name", "category_1_id", "category_2_id", "life_account_id",
-            "publish_user_id", "update_time", "create_time", "audit_status", "online_status","online_start_time"],
+            "publish_user_id", "update_time", "create_time", "audit_status", "online_status","online_start_time","online_end_time","online_type"],
             $where);
         if (!empty($list)) {
             foreach ($list as $key => $item) {

daemon/Goods.php

@@ -66,6 +66,7 @@ class Goods implements DaemonServiceInterface
         $orderData = [
             'online_type' => 2,
             'online_status' => 0,
+            'audit_status' => 1,
             'online_start_time[<]' => date("Y-m-d H:i:s",time()),
             'LIMIT' => 100,
         ];