价格

app-ghs/controllers/ProductController.php

@@ -239,9 +239,9 @@ class ProductController extends BaseController
             }
             if (in_array($this->mainId, $showFrontHide)) {
                 //只有花悠星、勇记、丽子鲜花 显示隐藏按钮功能，其他人不显示。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';
+                $field = 'id,py,cover,name,cost,itemId,classId,skPrice,bigUnit,smallUnit,ratio,ratioType,variety,price,hjPrice,discountPrice,hjDiscountPrice,skDiscountPrice,stock,actualSold,status,presell,frontHide';
             } else {
-                $field = 'id,py,cover,name,cost,itemId,classId,skPrice,bigUnit,smallUnit,ratio,ratioType,variety,price,hjPrice,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,hjDiscountPrice,skDiscountPrice,stock,actualSold,status,presell';
             }
             $itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], $field);
             $itemInfoData = ProductClass::itemListGroup($itemInfoData, $level);
@@ -1042,7 +1042,6 @@ class ProductController extends BaseController
             }
         }
 
-
         $shop = $this->shop;
         $join = $shop->join ?? 0;
         $default = $shop->default ?? 0;

biz-ghs/product/classes/ProductClass.php

@@ -313,23 +313,8 @@ class ProductClass extends BaseClass
             }
             if (isset($v['discountPrice']) && $v['discountPrice'] > 0) {
                 //做特价花材时，花材列表和改价列表显示的会员价和零售价，不能删除
-                $addPrice = $v['addPrice'] ?? 0;
-                $hjAddPrice = $v['hjAddPrice'] ?? 0;
-                $diff = bcsub($addPrice, $hjAddPrice, 2);
-                if ($diff > 0 && $v['discountPrice'] > $diff) {
-                    $hjPrice = bcsub($v['discountPrice'], $diff, 2);
-                } else {
-                    $hjPrice = $v['discountPrice'];
-                }
-                $list[$k]['hjPrice'] = floatval($hjPrice);
-                $skMore = $v['skMore'] ?? 0;
-                $diff = bcsub($skMore, $addPrice, 2);
-                if ($diff > 0) {
-                    $skPrice = bcadd($v['discountPrice'], $diff, 2);
-                } else {
-                    $skPrice = $v['discountPrice'];
-                }
-                $list[$k]['skPrice'] = floatval($skPrice);
+                $list[$k]['hjPrice'] = floatval($v['hjDiscountPrice']);
+                $list[$k]['skPrice'] = floatval($v['skDiscountPrice']);
             }
             $list[$k]['price'] = $price;
             $cost = $v['cost'] ?? 0;