From 682d6291d1d02a5e0063416f26d6e4e4939f3647 Mon Sep 17 00:00:00 2001
From: heshupeng <hsp@bronet.cn>
Date: Tue, 26 Jan 2021 14:48:17 +0800
Subject: [PATCH] 会员价

---
 addons/shopro/model/Goods.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/addons/shopro/model/Goods.php b/addons/shopro/model/Goods.php
index dd97007..1fba305 100644
--- a/addons/shopro/model/Goods.php
+++ b/addons/shopro/model/Goods.php
@@ -503,9 +503,6 @@ class Goods extends Model
                     $new_sku_price[$s] = $k;
                     $new_sku_price[$s]['price'] = round($k['price'] * $basicConfig['discount'] / 10,2);
                 }
-
-                $sku_price = $new_sku_price;
-                $detail['price'] = round($detail['price'] * $basicConfig['discount'] / 10,2);
             }
         }
 
@@ -521,10 +518,11 @@ class Goods extends Model
             }
         }
 
-        if ($activity) {
-            $prices = array_column($sku_price, 'price');
-            $detail['price'] = $prices ? min($prices) : 0;      // min 里面不能是空数组
+        // 展示金额用规格最小值
+        $prices = array_column($sku_price, 'price');
+        $detail['price'] = $prices ? min($prices) : 0;      // min 里面不能是空数组
 
+        if ($activity) {
             if ($activity['type'] == 'groupon') {
                 $grouponPrices = array_column($sku_price, 'groupon_price');
                 $detail['groupon_price'] = $grouponPrices ? min($grouponPrices) : 0;
--
libgit2 0.24.0