特价

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,discountPrice,skMore,stock,actualSold,status,presell,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';
             } else {
-                $field = 'id,py,cover,name,cost,itemId,classId,skPrice,bigUnit,smallUnit,ratio,ratioType,variety,price,discountPrice,skMore,stock,actualSold,status,presell';
+                $field = 'id,py,cover,name,cost,itemId,classId,skPrice,bigUnit,smallUnit,ratio,ratioType,variety,price,discountPrice,skMore,hjAddPrice,addPrice,stock,actualSold,status,presell';
             }
             $itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], $field);
             $itemInfoData = ProductClass::itemListGroup($itemInfoData, $level);

biz-ghs/product/classes/ProductClass.php

@@ -305,15 +305,30 @@ class ProductClass extends BaseClass
             $list[$k]['cover'] = $cover;
             //今日特价、会员价
             $price = self::getFinalPrice($v, $level, $priceMap, $addPriceMap);
-            //零售做特价时的原价
             if ($level == 0) {
-                $currentAddPrice = $v['skMore'] ?? 0;
-                $list[$k]['prePrice'] = bcadd($v['price'], $currentAddPrice, 2);
+                //零售做特价时显示的原价，不能删除
+                //$list[$k]['prePrice'] = bcadd($v['price'], $currentAddPrice, 2);
             }
             if (isset($v['discountPrice']) && $v['discountPrice'] > 0) {
-                //改价列表显示的零售价【重要】
-                $currentAddPrice = $v['skMore'] ?? 0;
-                $list[$k]['skPrice'] = bcadd($v['discountPrice'], $currentAddPrice, 2);
+                //做特价花材时，花材列表和改价列表显示的会员价和零售价，不能删除
+                $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'] = $skPrice;
             }
             $list[$k]['price'] = $price;
             $cost = $v['cost'] ?? 0;