|
|
@@ -405,6 +405,7 @@ class PurchaseClass extends BaseClass
|
|
|
$shopId = $data['shopId'] ?? 0;
|
|
|
$sjId = $data['sjId'] ?? 0;
|
|
|
$mainId = $data['mainId'] ?? 0;
|
|
|
+ $ghsId = $data['ghsId'] ?? 0;
|
|
|
$productList = ProductClass::toggleProductList($productList, $shopId, $sjId, $mainId);
|
|
|
|
|
|
$productData = self::getProductMapData($productList, "productId");
|
|
|
@@ -498,6 +499,7 @@ class PurchaseClass extends BaseClass
|
|
|
$productList[$key]['ghsProductId'] = $productId;
|
|
|
$productList[$key]['smallPrice'] = $price;
|
|
|
$productList[$key]['mainId'] = $mainId;
|
|
|
+ $productList[$key]['ghsId'] = $ghsId;
|
|
|
|
|
|
$currentBigUnit = $hdProductData[$hdProductId]['bigUnit'] ?? '';
|
|
|
$currentSmallUnit = $hdProductData[$hdProductId]['smallUnit'] ?? '';
|
|
|
@@ -513,7 +515,7 @@ class PurchaseClass extends BaseClass
|
|
|
$itemPrice = $price;
|
|
|
$price = bcmul($itemPrice, $xhNum, 2);
|
|
|
|
|
|
- //客户下单时会出现同时选了扎和支，很奇怪，前端没有找到原因，后端限制
|
|
|
+ //客户下单时会出现同时选了扎和支，很奇怪，前端没有找到原因，后端限制
|
|
|
if ($currentBigNum > 0 && $currentSmallNum > 0) {
|
|
|
util::fail($itemName . " {$currentBigUnit}和{$currentSmallUnit}只能选一种");
|
|
|
}
|
shish