|
|
@@ -30,17 +30,26 @@ class GoodsClass extends BaseClass
|
|
|
return $info;
|
|
|
}
|
|
|
|
|
|
- //组装商品基本信息 ssh 2019.12.2
|
|
|
- public static function groupGoodsBaseInfo($list)
|
|
|
+ /**
|
|
|
+ * 组装商品基本信息
|
|
|
+ * @param $list
|
|
|
+ * @param array $sortIds
|
|
|
+ * @return mixed
|
|
|
+ */
|
|
|
+ public static function groupGoodsBaseInfo($list, $sortIds = [])
|
|
|
{
|
|
|
+ if (empty($list)) {
|
|
|
+ return [];
|
|
|
+ }
|
|
|
+ $arrNotEmpty = is_array($sortIds) && !empty($sortIds);
|
|
|
|
|
|
//注意这里涉及商家节日涨价的问题,不要去取不同商家的商品,确有必要另外起方法!!!!!!
|
|
|
-
|
|
|
$currentData = current($list);
|
|
|
$sjId = $currentData['sjId'];
|
|
|
$rise = GoodsSettingClass::getRise($sjId);
|
|
|
|
|
|
foreach ($list as $key => $val) {
|
|
|
+ $id = $val['id'];
|
|
|
//大中小图片转化
|
|
|
$val = business::formatGoodsImg($val);
|
|
|
//免费配送范围
|
|
|
@@ -59,14 +68,29 @@ class GoodsClass extends BaseClass
|
|
|
$val['price'] = $price + $rise['riseAmount'];
|
|
|
}
|
|
|
}
|
|
|
- //临时加100块
|
|
|
- //$price = $val['price'];
|
|
|
- //$val['price'] = $price + 100;
|
|
|
$shortCover = $val['cover'] ?? '';
|
|
|
$val['cover'] = imgUtil::groupImg($shortCover);
|
|
|
$val['shortCover'] = $shortCover;
|
|
|
+ $val['smallCover'] = $val['cover'] . "?x-oss-process=image/resize,m_fill,h_130,w_130";
|
|
|
+ $val['bigCover'] = $val['cover'] . "?x-oss-process=image/resize,m_fill,h_700,w_700";
|
|
|
+
|
|
|
+ if ($arrNotEmpty) {
|
|
|
+ $sortIndex = array_search($id, $sortIds);
|
|
|
+ // $newList[$sortIndex] = $val;
|
|
|
+ $val['sortWeight'] = $sortIndex !== false ? $sortIndex : count($sortIds);
|
|
|
+ }
|
|
|
+
|
|
|
$list[$key] = $val;
|
|
|
}
|
|
|
+
|
|
|
+ if ($arrNotEmpty) {
|
|
|
+ usort($list, function($a, $b) {
|
|
|
+ return $a['sortWeight'] - $b['sortWeight'];
|
|
|
+ });
|
|
|
+ //return $newList;
|
|
|
+ // return array_values($newList);
|
|
|
+ }
|
|
|
+
|
|
|
return $list;
|
|
|
}
|
|
|
|