Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into lyz

application/library/Our/ImageConst.php

@@ -107,4 +107,6 @@ class ImageConst{
     const goodsStoreImg = 100; //商品详情页的店铺头像
     const goodsGroupImg = 182;//商品/组合详情页的其他搭配图片
     const groupGoodsImg = 160; //组合详情页的搭配商品
+    const storeGroupImg = 186; //店铺促销
+    const storeGroupGoodsImg = 130;
 }

application/models/Business/Goods/GroupSaleService.php

@@ -44,7 +44,9 @@ class GroupSaleServiceModel extends \Business\AbstractModel {
         $data['image'] = [];
         if($blImg = unserialize($data['bl_image'])){
             foreach ($blImg as $v){
-                $data['image'][] = \Our\ImageUtil::getGoodsImgUrl($v,\Our\ImageConst::goodsDetailImgSize);
+                if($v) {
+                    $data['image'][] = \Our\ImageUtil::getGoodsImgUrl($v,\Our\ImageConst::goodsDetailImgSize);
+                }
             }
         }
         $data['goods'] = [];
@@ -347,7 +349,7 @@ class GroupSaleServiceModel extends \Business\AbstractModel {
             foreach ($groupList as $k=>$v){
                 if($v['bl_quota_starttime']<TIMESTAMP&&$v['endTime']>=TIMESTAMP){
                     $v['groupId'] = $v['blId'];
-                    $v['image'] = ImageUtil::getGoodsImgUrl($v['image']);
+                    $v['image'] = ImageUtil::getGoodsImgUrl($v['image'],\Our\ImageConst::storeGroupImg);
                     unset($v['bl_title']);
                     unset($v['store_id']);
                     unset($v['store_name']);
@@ -366,6 +368,7 @@ class GroupSaleServiceModel extends \Business\AbstractModel {
                     $goods = [];
                     if($v['goodsList']){
                         foreach ($v['goodsList'] as $v2){
+                            $v2['goodsImage'] = ImageUtil::getGoodsImgWithUrl($v2['goodsImage'],\our\ImageConst::storeGroupGoodsImg);
                             unset($v2['goods_id']);
                             unset($v2['goodsStorage']);
                             unset($v2['bl_id']);