|
|
@@ -379,16 +379,16 @@ class ProductController extends BaseController
|
|
|
$field = 'id,py,cover,name,ratio,classId,itemId,weight,smallUnit,bigUnit,smallUnit,smallRatio,ratioType,variety,price,skPrice,skDiscountPrice,hjPrice,hjDiscountPrice,actualSold,stock,stockWarning,discountPrice,presell,presellDate,reachNum,reachNumDiscount';
|
|
|
$itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], $field);
|
|
|
$itemInfoData = ProductClass::hdCgGroup($itemInfoData, $level);
|
|
|
- $myProduct = ProductClass::getAllByCondition(['mainId' => $this->mainId, 'delStatus' => 0], null, 'id,stock,onStock,stockWarning', 'id');
|
|
|
+ $myProduct = ProductClass::getAllByCondition(['mainId' => $this->mainId, 'delStatus' => 0], null, 'id,stock,onStock,stockWarning,itemId', 'itemId');
|
|
|
if (!empty($itemInfoData)) {
|
|
|
$myShop = $this->shop;
|
|
|
$myDisplay = isset($myShop->pfShopId) && $myShop->pfShopId > 0 ? 1 : 0;
|
|
|
foreach ($itemInfoData as $key => $val) {
|
|
|
- $productId = $val['id'] ?? 0;
|
|
|
- $myStock = $myProduct[$productId]['stock'] ?? 0;
|
|
|
+ $ptItemId = $val['itemId'] ?? 0;
|
|
|
+ $myStock = $myProduct[$ptItemId]['stock'] ?? 0;
|
|
|
$myStock = floatval($myStock);
|
|
|
- $myOnStock = $myProduct[$productId]['onStock'] ?? 0;
|
|
|
- $myStockWarning = $myProduct[$productId]['stockWarning'] ?? 5;
|
|
|
+ $myOnStock = $myProduct[$ptItemId]['onStock'] ?? 0;
|
|
|
+ $myStockWarning = $myProduct[$ptItemId]['stockWarning'] ?? 5;
|
|
|
$myLack = bcadd($myStock, $myOnStock, 2) > $myStockWarning ? 0 : 1;
|
|
|
$itemInfoData[$key]['myStock'] = $myStock;
|
|
|
$itemInfoData[$key]['myOnStock'] = $myOnStock;
|
