|
|
@@ -129,6 +129,7 @@ class ProductService extends BaseService
|
|
|
{
|
|
|
//今日特价
|
|
|
$tjItem = [];
|
|
|
+ $mjItem = [];
|
|
|
$itemGroup = [];
|
|
|
$preSellItem = [];
|
|
|
if ($itemInfoData) {
|
|
|
@@ -138,7 +139,7 @@ class ProductService extends BaseService
|
|
|
if ($reachNum > 0 && $reachNumDiscount > 0) {
|
|
|
$v['classId'] = self::OFTEN_CLASS_ID;
|
|
|
$v['className'] = '满减活动';
|
|
|
- $tjItem[] = $v;
|
|
|
+ $mjItem[] = $v;
|
|
|
$itemGroup[] = $v;
|
|
|
}
|
|
|
if ((isset($v['discountPrice']) && $v['discountPrice'] > 0)) {
|
|
|
@@ -198,6 +199,16 @@ class ProductService extends BaseService
|
|
|
$classData[] = $tmp;
|
|
|
}
|
|
|
}
|
|
|
+ if ($showTodayDiscount && !empty($mjItem)) {
|
|
|
+ $mjClass = [[
|
|
|
+ 'classId' => self::OFTEN_CLASS_ID,
|
|
|
+ 'className' => '满减活动',
|
|
|
+ 'print' => 0,
|
|
|
+ 'classCover' => imgUtil::groupImg('item_class/mrfl.jpg'),
|
|
|
+ 'child' => $mjItem,
|
|
|
+ ]];
|
|
|
+ $classData = array_merge($mjClass, $classData);
|
|
|
+ }
|
|
|
if ($showTodayDiscount && !empty($tjItem)) {
|
|
|
//限购的排在最前面,多处同步修改limit_ahead
|
|
|
$tjItem = arrayUtil::arraySort($tjItem, 'limitBuy');
|