shish 3 лет назад
Родитель
Сommit
d0e2d27972
2 измененных файлов с 7 добавлено и 13 удалено
  1. 1 1
      biz-ghs/custom/classes/CustomClass.php
  2. 6 12
      biz-ghs/product/classes/ProductClass.php

+ 1 - 1
biz-ghs/custom/classes/CustomClass.php

@@ -51,7 +51,7 @@ class CustomClass extends BaseClass
     ];
 
     public static $levelAddPriceKeyMap = [
-        self::LEVEL_SK => 'skAddPrice',
+        self::LEVEL_SK => 'skMore',
         self::LEVEL_PT => 'addPrice',
         self::LEVEL_HJ => 'hjAddPrice',
         self::LEVEL_ZS => 'zsAddPrice',

+ 6 - 12
biz-ghs/product/classes/ProductClass.php

@@ -159,25 +159,19 @@ class ProductClass extends BaseClass
         if (empty($product) || isset($product['price']) == false) {
             return 0;
         }
-        //今日特价
-        $discountPrice = $product['discountPrice'] ?? 0;
-
         $currentPriceField = $priceMap[$level] ?? 'price';
         $price = $product[$currentPriceField] ?? 0;
-        if ($discountPrice > 0) {
-
-            $discountAddPrice = $product['addPrice'] ?? 0;
 
+        //今日特价
+        $discountPrice = $product['discountPrice'] ?? 0;
+        if ($discountPrice > 0) {
             $currentAddPriceField = $addPriceMap[$level] ?? 'addPrice';
             $currentAddPrice = $product[$currentAddPriceField] ?? 0;
-
-            $diff = bcsub($discountAddPrice, $currentAddPrice, 2);
-            $price = bcsub($discountPrice, $diff, 2);
-
+            if ($currentAddPriceField == 'skMore') {
+                $price = bcadd($discountPrice, $currentAddPrice, 2);
+            }
         }
-
         return $price;
-
     }
 
     //根据花材ID,库存=》  计算出多少扎,多少支