林琦海 5 лет назад
Родитель
Сommit
8d131b0348
2 измененных файлов с 4 добавлено и 4 удалено
  1. 1 0
      biz-ghs/order/classes/OrderClass.php
  2. 3 4
      biz-ghs/product/classes/ProductClass.php

+ 1 - 0
biz-ghs/order/classes/OrderClass.php

@@ -101,6 +101,7 @@ class OrderClass extends BaseClass
             $w = ProductClass::getWeight($val['productId'], $val['bigNum'], $val['smallNum']);
             $weight = bcadd($w,$weight,2);
         }
+
         $data['weight'] = $weight;
         $return = self::add($data);
 

+ 3 - 4
biz-ghs/product/classes/ProductClass.php

@@ -211,7 +211,7 @@ class ProductClass extends BaseClass
 		if (!$productData) {
 			util::fail("花材不存在");
 		}
-		$newStock = bcadd($productData->stock, $itemNum, 2);
+		$newStock = bcadd($productData->stock, $productData['ratio'], 2);
 		self::updateStockById($productId, $newStock);
 		return true;
 	}
@@ -230,10 +230,9 @@ class ProductClass extends BaseClass
 		if (!$productData) {
 			util::fail("花材不存在");
 		}
-		$itemId = $productData['itemId'];
-		$unitNum = xhItemService::getItemUnitNum($itemId);
+		$ratio = $productData['ratio'];
 		//转成小数,更新库存
-		$itemNum = self::mergeItemNum($itemNumBundle, $itemNumPiece, $unitNum);
+		$itemNum = self::mergeItemNum($itemNumBundle, $itemNumPiece, $ratio);
 		$newStock = bcsub($productData->stock, $itemNum, 2);
 		self::updateStockById($productId, $newStock);
 		return true;