花材列表

app-ghs/controllers/ProductController.php

@@ -231,7 +231,7 @@ class ProductController extends BaseController
                 //花材列表
                 $field = 'id,py,cover,name,cost,classId,skPrice,variety,price,stock,presell';
                 $itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], $field);
-                $itemInfoData = ProductClass::groupProductInfo($itemInfoData, $level);
+                $itemInfoData = ProductClass::itemListGroup($itemInfoData, $level);
             } elseif ($requestType == 'warning') {
                 //库存预警
                 $field = 'id,py,cover,name,ratio,cost,addPrice,classId,skMore,skPrice,itemId,smallUnit,smallRatio,bigUnit,smallUnit,ratioType,variety,price,stock,stockWarning,discountPrice,presell,presellDate';

biz-ghs/product/classes/ProductClass.php

@@ -101,6 +101,49 @@ class ProductClass extends BaseClass
         return current($list);
     }
 
+    //花材图片，名称，大小单位,小单位价格
+    public static function itemListGroup($list, $level = 0)
+    {
+        //各个等级对应的price addPrice字段
+        $priceMap = CustomClass::$levelPriceKeyMap;
+        $addPriceMap = CustomClass::$levelAddPriceKeyMap;
+
+        foreach ($list as $k => $v) {
+            $shortCover = $v['cover'] ?? '';
+            $cover = imgUtil::getPrefix() . 'hhb_small.png';
+            $bigCover = imgUtil::getPrefix() . 'hhb_small.png';
+            if (!empty($shortCover)) {
+                $parse = parse_url(self::groupImg($shortCover));
+                if (empty($parse['query'])) {
+                    $cover = self::groupImg($shortCover) . "?x-oss-process=image/resize,m_fill,h_100,w_100";
+                } else {
+                    $cover = self::groupImg($shortCover);
+                }
+                $bigCover = imgUtil::groupImg($shortCover) . "?x-oss-process=image/resize,m_fill,h_700,w_700";
+            }
+            $list[$k]['cover'] = $cover;
+            $list[$k]['bigCover'] = $bigCover;
+            $list[$k]['shortCover'] = $shortCover;
+            $list[$k]['itemName'] = $v['name'] ?? '';
+            $list[$k]['prePrice'] = $v['price'] ?? 0;
+            //今日特价、会员价
+            $price = self::getFinalPrice($v, $level, $priceMap, $addPriceMap);
+            //零售做特价时的原价
+            if ($level == 0) {
+                $currentAddPrice = $v['skMore'] ?? 0;
+                $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);
+            }
+            $list[$k]['price'] = $price;
+            $list[$k]['bigPrice'] = $price;
+        }
+        return $list;
+    }
+
     //花材图片，名称，大小单位,小单位价格
     public static function groupProductInfo($list, $level = 0)
     {