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

application/models/Business/Goods/GroupSaleService.php

@@ -49,6 +49,7 @@ class GroupSaleServiceModel extends \Business\AbstractModel {
                 }
             }
         }
+
         $data['goods'] = [];
         if($data['goodsList'] && is_array($data['goodsList'])){
             foreach ($data['goodsList'] as $v){
@@ -381,6 +382,11 @@ class GroupSaleServiceModel extends \Business\AbstractModel {
                 if($v['bl_quota_starttime']<TIMESTAMP&&$v['endTime']>=TIMESTAMP){
                     $v['groupId'] = $v['blId'];
                     $v['image'] = ImageUtil::getGoodsImgUrl($v['image'],\Our\ImageConst::storeGroupImg);
+                    if($v['bl_storage']<=\Our\ApiConst::zero){
+                        $v['goodsState'] = \Our\ApiConst::cartGoodsNoStorage;
+                    }else{
+                        $v['goodsState'] = \Our\ApiConst::cartGoodsOnline;
+                    }
                     unset($v['bl_title']);
                     unset($v['store_id']);
                     unset($v['store_name']);