|
@@ -89,6 +89,11 @@ class PurchaseClass extends BaseClass
|
|
|
$itemNum = ProductClass::mergeItemNum($product['bigNum'], $product['smallNum'], $ratio);//采购数量
|
|
$itemNum = ProductClass::mergeItemNum($product['bigNum'], $product['smallNum'], $ratio);//采购数量
|
|
|
$price = $productData[$productId]['price']; //卖的单价
|
|
$price = $productData[$productId]['price']; //卖的单价
|
|
|
$sellPrice = bcmul($itemNum, $price, 2); //采购总价
|
|
$sellPrice = bcmul($itemNum, $price, 2); //采购总价
|
|
|
|
|
+ $totalPrice = $sellPrice;
|
|
|
|
|
+ //供应商改价
|
|
|
|
|
+ if (isset($product['userPrice']) && $product['userPrice'] > 0) {
|
|
|
|
|
+ $totalPrice = $product['userPrice'];
|
|
|
|
|
+ }
|
|
|
$itemInfo = [
|
|
$itemInfo = [
|
|
|
'itemName' => $hdProductData[$hdProductId]['name'] ?? '',//花材名称
|
|
'itemName' => $hdProductData[$hdProductId]['name'] ?? '',//花材名称
|
|
|
'itemCover' => $hdProductData[$hdProductId]['cover'] ?? '',//花材图片
|
|
'itemCover' => $hdProductData[$hdProductId]['cover'] ?? '',//花材图片
|
|
@@ -108,7 +113,8 @@ class PurchaseClass extends BaseClass
|
|
|
$productList[$key]['itemNum'] = $itemNum;
|
|
$productList[$key]['itemNum'] = $itemNum;
|
|
|
$productList[$key]['price'] = $price;
|
|
$productList[$key]['price'] = $price;
|
|
|
$productList[$key]['ratio'] = $ratio;
|
|
$productList[$key]['ratio'] = $ratio;
|
|
|
- $productList[$key]['totalPrice'] = $sellPrice;
|
|
|
|
|
|
|
+ $productList[$key]['totalPrice'] = $totalPrice;
|
|
|
|
|
+ $productList[$key]['preTotalPrice'] = $sellPrice;
|
|
|
$productList[$key]['productId'] = $hdProductId;
|
|
$productList[$key]['productId'] = $hdProductId;
|
|
|
$productList[$key]['ghsProductId'] = $productId;
|
|
$productList[$key]['ghsProductId'] = $productId;
|
|
|
|
|
|