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

application/models/Business/Goods/GroupSaleService.php

@@ -27,10 +27,12 @@ class GroupSaleServiceModel extends \Business\AbstractModel {
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyPBundlingdForOrder);
         }
         $data = $groupList[0];
-        if($data['goodsCountFlag'] === false){
-            $data['state'] = 0;
-        }else{
-            $data['state'] = $data['bl_state'];
+        $data['state'] = \Our\ApiConst::one;
+        if(!($data['bl_state'] == \Our\ApiConst::one && ($data['bl_quota_starttime'] < time() && $data['endTime'] >= time()))||!$data['goodsCountFlag']) {
+            $data['state'] = \Our\ApiConst::zero;
+        }
+        if($data['bl_storage']<=\Our\ApiConst::zero) {
+            $data['state'] = \Our\ApiConst::zero;
         }
         unset($data['blId']);
         unset($data['store_name']);
@@ -263,24 +265,26 @@ class GroupSaleServiceModel extends \Business\AbstractModel {
         $group = array();
         if($groupList){
             foreach ($groupList as $k=>$v){
-                $v['groupId'] = $v['blId'];
-                $v['image'] = ImageUtil::getGoodsImgUrl($v['image'],\our\ImageConst::goodsGroupImg);
-                unset($v['goodsList']);
-                unset($v['bl_title']);
-                unset($v['store_id']);
-                unset($v['store_name']);
-                unset($v['bl_state']);
-                unset($v['bl_quota_starttime']);
-                unset($v['bl_image']);
-                unset($v['bl_storage']);
-                unset($v['blId']);
-                unset($v['goodsCountFlag']);
-                unset($v['is_transport']);
-                unset($v['transport_id']);
-                unset($v['snapshot_id']);
-                unset($v['goods_freight']);
-                unset($v['goods_free']);
-                $group[] = $v;
+                if($v['bl_quota_starttime']<TIMESTAMP&&$v['endTime']>=TIMESTAMP && $v['bl_storage'] > \Our\ApiConst::zero) {
+                    $v['groupId'] = $v['blId'];
+                    $v['image'] = ImageUtil::getGoodsImgUrl($v['image'], \our\ImageConst::goodsGroupImg);
+                    unset($v['goodsList']);
+                    unset($v['bl_title']);
+                    unset($v['store_id']);
+                    unset($v['store_name']);
+                    unset($v['bl_state']);
+                    unset($v['bl_quota_starttime']);
+                    unset($v['bl_image']);
+                    unset($v['bl_storage']);
+                    unset($v['blId']);
+                    unset($v['goodsCountFlag']);
+                    unset($v['is_transport']);
+                    unset($v['transport_id']);
+                    unset($v['snapshot_id']);
+                    unset($v['goods_freight']);
+                    unset($v['goods_free']);
+                    $group[] = $v;
+                }
             }
         }
         return $group;
@@ -331,7 +335,7 @@ class GroupSaleServiceModel extends \Business\AbstractModel {
         $return = array();
         if($group){
             foreach ($group as $k=>$v){
-                if($v['bl_quota_starttime']<TIMESTAMP&&$v['endTime']>=TIMESTAMP){
+                if($v['bl_quota_starttime']<TIMESTAMP&&$v['endTime']>=TIMESTAMP && $v['bl_storage'] > \Our\ApiConst::zero){
                     $v['groupId'] = $v['blId'];
                     $v['image'] = ImageUtil::getGoodsImgUrl($v['image'],\Our\ImageConst::goodsGroupImg);
                     unset($v['goodsList']);

application/models/DAO/Goods/StoreTopSaleGoods.php

@@ -93,7 +93,7 @@ FROM han_goods_common t1 where t1.goods_state={1} and t1.goods_verify={2} and t1
 ) a
 left join han_goods_score_statistics b
 on a.goods_commonid = b.goods_commonid
-WHERE a.group_id<=3 AND a.sale_num>0 ',\Our\ApiConst::defaultGoodsScore,\Our\ApiConst::onlineGoodsState,\Our\ApiConst::onlineGoodsVerify,$storeId,\Our\ApiConst::onlineGoodsState);
+WHERE a.group_id<=3 AND a.sale_num>0 ',\Our\ApiConst::defaultGoodsScore,\Our\ApiConst::onlineGoodsState,\Our\ApiConst::onlineGoodsVerify,$storeId,\Our\ApiConst::onlineGoodsDel);
         $list = $this->db->query($sql)->rows;
         return $list;
     }