lizhen_gitee hai 3 meses
pai
achega
bffd48936a

+ 2 - 4
addons/shopro/controller/goods/Goods.php

@@ -147,8 +147,6 @@ class Goods extends Common
                 $goods->original_goods_price = $goods->original_goods_price;
             }*/
 
-            $goods->activity = $goods->activity;
-
             $old_goods_price = $goods->original_goods_price;  //getOriginalGoodsPriceAttr
             $goods->old_goods_price = $old_goods_price ? $old_goods_price : $goods->price;
 
@@ -189,11 +187,11 @@ class Goods extends Common
                     $goods['price'][0] = $skuPrice['price'];
                     $goods['old_goods_price'][0] = $skuPrice['old_price'];
 
-                    $goods['current_sku'] = [
+                    /*$goods['current_sku'] = [
                         'id' => $skuPrice['id'],
                         'goods_sku_ids' => $skuPrice['goods_sku_ids'],
                         'goods_sku_text' => $skuPrice['goods_sku_text'],
-                    ];
+                    ];*/
                 }
 
             }

+ 2 - 2
addons/shopro/library/activity/ActivityRedis.php

@@ -183,9 +183,9 @@ class ActivityRedis
             }
 
             //倒计时
-            if(isset($activity['end_time'])){
+            /*if(isset($activity['end_time'])){
                 $activity['seconds'] = $activity['end_time'] - time();
-            }
+            }*/
         }
 
         return $activity ?? null;

+ 2 - 0
addons/shopro/library/activity/provider/Seckill.php

@@ -80,6 +80,8 @@ class Seckill extends Base
                     // 记录相关活动类型
                     $skuPrice->activity_type = $activity['type'];
                     $skuPrice->activity_id = $activity['id'];
+                    $skuPrice->activity_endtime = $activity['end_time'];
+                    $skuPrice->activity_seconds = $activity['end_time'] - time();
                     // 下单的时候需要存活动 的 sku_price_id)
                     $skuPrice->item_goods_sku_price = $activitySkuPrice;
                     break;