Browse Source

商品详情

lizhen_gitee 3 months ago
parent
commit
7558293e27

+ 10 - 0
addons/shopro/controller/goods/Goods.php

@@ -147,6 +147,8 @@ 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;
 
@@ -178,6 +180,7 @@ class Goods extends Common
         $skuPrices      = list_domain_image($skuPrices->toArray(),['image']);//规格图
 
 
+        $goods['current_sku'] = (object)[];
         foreach ($skuPrices as $key => $skuPrice) {
             //如果传过来规格id,那主图,price的第零个,original_goods_price的第零个  都需要跟着变
             if($goods_sku_price_id){
@@ -185,7 +188,14 @@ class Goods extends Common
                     $goods['image'] = $skuPrice['image'] ? $skuPrice['image'] : $goods['image'];
                     $goods['price'][0] = $skuPrice['price'];
                     $goods['old_goods_price'][0] = $skuPrice['old_price'];
+
+                    $goods['current_sku'] = [
+                        'id' => $skuPrice['id'],
+                        'goods_sku_ids' => $skuPrice['goods_sku_ids'],
+                        'goods_sku_text' => $skuPrice['goods_sku_text'],
+                    ];
                 }
+
             }
         }
 

+ 5 - 0
addons/shopro/library/activity/ActivityRedis.php

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

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

@@ -75,6 +75,7 @@ class Seckill extends Base
                     $skuPrice->status = $activitySkuPrice['status'];        // 采用活动的上下架
                     $skuPrice->min_price = $activitySkuPrice['price'];      // 当前活动规格最小价格,这里是秒杀价
                     $skuPrice->max_price = $activitySkuPrice['price'];      // 用作计算活动中最大价格
+                    $skuPrice->zhekou  = bcdiv($skuPrice->price,$skuPrice->old_price,2);      // 折扣
 
                     // 记录相关活动类型
                     $skuPrice->activity_type = $activity['type'];