update:修改文案冲突

application/exception/custom/GoodsException.php

@@ -70,5 +70,6 @@ class GoodsException extends BaseException
         49 => '库存不得小于已售库存',
         self::RULE_LIMIT_ERROR => '单人可买上限填写错误',
         self::NOT_FIND_MARKETING => '找不到活动',
+        52 => '商品过期时间小于等于，上架时间',
     ];
 }
\ No newline at end of file

application/services/goods/GoodsService.php

@@ -281,6 +281,15 @@ class GoodsService
                 break;
         }
 
+        if (!empty($skuData["online_type"])) {
+            //立即上架和定时上架
+            if (in_array($skuData["online_type"], [1,2])) {
+                if ($skuData["expiration_time"] <= $skuData['online_start_time']) {
+                    throw new GoodsException(["cus" => 49]);
+                }
+            }
+        }
+
         GoodsSku::save($skuParams);
         self::addGoodsSkuPicRecord($skuId, $skuData);
         return $skuId;
@@ -429,14 +438,12 @@ class GoodsService
                     ];
                 }
                 
+                if ($status == GoodsSku::STATUS_PASS) {
                     $online_type = empty($sku["online_type"]) ? 0 : $sku["online_type"];
-
                     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) {
@@ -448,7 +455,8 @@ class GoodsService
 
                     //暂不上架
                     if ($online_type == 3) {
-                    $statusData['online_status'] = GoodsSku::ONLINE_STATUS_NO_ONLINE;
+                        $statusData['online_status'] = GoodsSku::ONLINE_STATUS_OFFLINE;
+                    }
                 }
 
                 GoodsSku::save($statusData, ["goods_sku_id" => $sku["goods_sku_id"]]);
@@ -574,6 +582,7 @@ class GoodsService
         $goodsSkuList = GoodsSku::select("*", ["goods_spu_id" => $goodsSpuId]);
         if (!empty($goodsSkuList)) {
             foreach ($goodsSkuList as $sku) {
+
                 $goodsSkuId = $sku["goods_sku_id"];
                 $goodsSkuData = [
                     "online_type" => $onlineType,
@@ -600,6 +609,13 @@ class GoodsService
                     }
                 }
 
+                //立即上架和定时上架
+                if (in_array($onlineType, [1,2])) {
+                    if ($sku["expiration_time"] <= $goodsSkuData['online_start_time']) {
+                        throw new GoodsException(["cus" => 49]);
+                    }
+                }
+
                 GoodsSku::save($goodsSkuData, ["goods_sku_id" => $goodsSkuId]);
                 //上架的话，生成快照
                 self::addGoodsSnapshot($sku);
@@ -829,6 +845,16 @@ class GoodsService
             $skuParams['online_type'] = empty($params["online_type"]) ? 0 : $params["online_type"];
         }
 
+
+        if (!empty($params["online_type"])) {
+            //立即上架和定时上架
+            if (in_array($params["online_type"], [1,2])) {
+                if ($skuData["expiration_time"] <= $skuParams['online_start_time']) {
+                    throw new GoodsException(["cus" => 49]);
+                }
+            }
+        }
+
         //商品操作记录
         $record = [
             "goods_spu_id" => $skuData["goods_spu_id"],

daemon/Goods.php

@@ -102,7 +102,7 @@ class Goods implements DaemonServiceInterface
         ];
 
         $goodsList = GoodsSku::getRecords($orderData);
-        DaemonLog::info('DaemonServiceOnline_goods', json_encode($goodsList));
+        DaemonLog::info('DaemonServiceOnlineOff_goods', json_encode($goodsList));
         foreach ($goodsList as $key => $value) {
             $where = [];
             $where['goods_sku_id'] = !empty($value['goods_sku_id']) ? $value['goods_sku_id'] : '';