shish 3 лет назад
Родитель
Сommit
95dbd0d120
2 измененных файлов с 4 добавлено и 4 удалено
  1. 0 1
      biz-ghs/product/classes/ProductClass.php
  2. 4 3
      biz-hd/purchase/classes/PurchaseClass.php

+ 0 - 1
biz-ghs/product/classes/ProductClass.php

@@ -162,7 +162,6 @@ class ProductClass extends BaseClass
         //今日特价
         //今日特价
         $discountPrice = $product['discountPrice'] ?? 0;
         $discountPrice = $product['discountPrice'] ?? 0;
 
 
-
         $currentPriceField = $priceMap[$level] ?? 'price';
         $currentPriceField = $priceMap[$level] ?? 'price';
         $price = $product[$currentPriceField] ?? 0;
         $price = $product[$currentPriceField] ?? 0;
         if ($discountPrice > 0) {
         if ($discountPrice > 0) {

+ 4 - 3
biz-hd/purchase/classes/PurchaseClass.php

@@ -351,7 +351,6 @@ class PurchaseClass extends BaseClass
 
 
             $unitWeight = $hdProductData[$hdProductId]['weight'] ?? 0;
             $unitWeight = $hdProductData[$hdProductId]['weight'] ?? 0;
             $variety = $hdProductData[$hdProductId]['variety'] ?? 0;
             $variety = $hdProductData[$hdProductId]['variety'] ?? 0;
-            $smallRatio = $hdProductData[$hdProductId]['smallRatio'] ?? 1;
             $ratio = $hdProductData[$hdProductId]['ratio'] ?? 0;
             $ratio = $hdProductData[$hdProductId]['ratio'] ?? 0;
             $itemId = $hdProductData[$hdProductId]['itemId'] ?? 0;
             $itemId = $hdProductData[$hdProductId]['itemId'] ?? 0;
             $rank = $hdProductData[$hdProductId]['rank'] ?? 'B';
             $rank = $hdProductData[$hdProductId]['rank'] ?? 'B';
@@ -372,8 +371,10 @@ class PurchaseClass extends BaseClass
             $bigPrice = $price;
             $bigPrice = $price;
 
 
             if ($currentSmallNum > 0) {
             if ($currentSmallNum > 0) {
-                $price = bcdiv($price, $ratio, 2);
-                $price = bcmul($price, $smallRatio, 2);
+                $ghsRatio = $currentProduct['ratio'] ?? 0;
+                $ghsSmallRatio = $currentProduct['smallRatio'] ?? 1;
+                $price = bcdiv($price, $ghsRatio, 2);
+                $price = bcmul($price, $ghsSmallRatio, 2);
                 $productTotalPrice = bcmul($currentSmallNum, $price, 2);
                 $productTotalPrice = bcmul($currentSmallNum, $price, 2);
             } else {
             } else {
                 $productTotalPrice = bcmul($currentBigNum, $price, 2);
                 $productTotalPrice = bcmul($currentBigNum, $price, 2);