|
|
@@ -588,9 +588,6 @@ class ProductClass extends BaseClass
|
|
|
util::fail('花材价格不能小于0');
|
|
|
}
|
|
|
$userPrice = $v['price'];
|
|
|
- } else {
|
|
|
- //按原来的计算方法,合计价格
|
|
|
-
|
|
|
}
|
|
|
|
|
|
//合计价格
|
|
|
@@ -614,13 +611,17 @@ class ProductClass extends BaseClass
|
|
|
$tmp['cover'] = $productData[$productId]['cover'] ?? '';
|
|
|
$tmp['itemId'] = $itemId;
|
|
|
$tmp['rank'] = $productData[$productId]['rank'] ?? '';
|
|
|
- $tmp['ratio'] = $productData[$productId]['ratio'] ?? 0;
|
|
|
+ $tmp['ratio'] = $productData[$productId]['ratio'] ?? 1;
|
|
|
$tmp['unitPrice'] = $itemPrice;
|
|
|
$tmp['num'] = $itemNum;
|
|
|
$tmp['bigNum'] = $v['bigNum'];
|
|
|
$tmp['smallNum'] = $v['smallNum'];
|
|
|
$tmp['userPrice'] = $userPrice;
|
|
|
|
|
|
+ //小单位单价
|
|
|
+ $smallUnitPrice = bcdiv($itemPrice, $tmp['ratio'], 2);
|
|
|
+ $tmp['smallUnitPrice'] = $smallUnitPrice;
|
|
|
+
|
|
|
$totalBigNum += $v['bigNum'];
|
|
|
$totalSmallNum += $v['smallNum'];
|
|
|
|