shish 3 years ago
parent
commit
b1cdefda9c

+ 2 - 2
app-ghs/controllers/ProductController.php

@@ -239,9 +239,9 @@ class ProductController extends BaseController
             }
             }
             if (in_array($this->mainId, $showFrontHide)) {
             if (in_array($this->mainId, $showFrontHide)) {
                 //只有花悠星和勇记显示隐藏按钮功能,其他人不显示。frontHide
                 //只有花悠星和勇记显示隐藏按钮功能,其他人不显示。frontHide
-                $field = 'id,py,cover,name,cost,itemId,classId,skPrice,bigUnit,smallUnit,ratio,ratioType,variety,price,discountPrice,skMore,hjAddPrice,addPrice,stock,actualSold,status,presell,frontHide';
+                $field = 'id,py,cover,name,cost,itemId,classId,skPrice,bigUnit,smallUnit,ratio,ratioType,variety,price,hjPrice,discountPrice,skMore,hjAddPrice,addPrice,stock,actualSold,status,presell,frontHide';
             } else {
             } else {
-                $field = 'id,py,cover,name,cost,itemId,classId,skPrice,bigUnit,smallUnit,ratio,ratioType,variety,price,discountPrice,skMore,hjAddPrice,addPrice,stock,actualSold,status,presell';
+                $field = 'id,py,cover,name,cost,itemId,classId,skPrice,bigUnit,smallUnit,ratio,ratioType,variety,price,hjPrice,discountPrice,skMore,hjAddPrice,addPrice,stock,actualSold,status,presell';
             }
             }
             $itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], $field);
             $itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], $field);
             $itemInfoData = ProductClass::itemListGroup($itemInfoData, $level);
             $itemInfoData = ProductClass::itemListGroup($itemInfoData, $level);

+ 1 - 2
biz-ghs/product/classes/ProductClass.php

@@ -320,7 +320,6 @@ class ProductClass extends BaseClass
                     $hjPrice = $v['discountPrice'];
                     $hjPrice = $v['discountPrice'];
                 }
                 }
                 $list[$k]['hjPrice'] = floatval($hjPrice);
                 $list[$k]['hjPrice'] = floatval($hjPrice);
-
                 $skMore = $v['skMore'] ?? 0;
                 $skMore = $v['skMore'] ?? 0;
                 $diff = bcsub($skMore,$addPrice,2);
                 $diff = bcsub($skMore,$addPrice,2);
                 if($diff>0){
                 if($diff>0){
@@ -328,7 +327,7 @@ class ProductClass extends BaseClass
                 }else{
                 }else{
                     $skPrice = $v['discountPrice'];
                     $skPrice = $v['discountPrice'];
                 }
                 }
-                $list[$k]['skPrice'] = $skPrice;
+                $list[$k]['skPrice'] = floatval($skPrice);
             }
             }
             $list[$k]['price'] = $price;
             $list[$k]['price'] = $price;
             $cost = $v['cost'] ?? 0;
             $cost = $v['cost'] ?? 0;