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

application/library/Our/ApiConst.php

@@ -303,6 +303,7 @@ class ApiConst
 
     const onlineGoodsState = 1;//正常商品状态
     const onlineGoodsVerify = 1;  //商品已通过审核
+    const onlineGoodsDel = 0;  //商品未删除
 
     const cartGoodsOnline = 1;//购物车商品正常
     const cartGoodsOffline = 2; //购物车商品下架

application/models/Business/Goods/GoodsCommonService.php

@@ -334,6 +334,7 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
         $productData = \Our\RedisHelper::cachedFunction(\Redis\Db4\GoodsAttributeRedisModel::getInstance(),array(&$attrbuteDAO, 'option'),array('attribute,attribute_value',array('goods_commonid'=>$goodsCommonId)),\Our\ApiConst::oneDaySecond,array($goodsCommonId));
 
         $html = array('width'=>750,'height'=>$commonInfo['goods_height'],'url'=>\Our\Common::getBaseUrl().'/index/goodsDetail?goodsCommonId='.$goodsCommonId);
+        if($commonInfo['is_del'] == 1) $commonInfo['goods_state'] == 0;
         unset($attrs['commonInfo']);
         return array_merge(array('storeId'=>$commonInfo['store_id'],'goodsId'=>$commonInfo['goodsId'],'goodsName'=>$commonInfo['goods_name'],'goodsVerify'=>$commonInfo['goods_verify'],'goodsState'=>$commonInfo['goods_state'],'saleCount'=>$commonInfo['sale_num'],'collectionState'=>$collectionState,'isOwn'=>$isOwn,'isHot'=>$commonInfo['goods_hot'],'isRecoment'=>$commonInfo['goods_commend'],'isFree'=>$commonInfo['goods_free'],'isVirtual'=>$commonInfo['is_virtual'],'goodsMostLimit'=>$commonInfo['goods_most_limit'],'goodsLeastLimit'=>$commonInfo['goods_least_limit'],'goodsTotalLimit'=>$commonInfo['goods_total_limit'],'address'=>$area,'range'=>$rangePrice,'productData'=>$productData,'htmlContent'=>$html,'videoUrl'=>$commonInfo['goods_youku_url']),$attrs);
     }
@@ -346,7 +347,7 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
         $activities = \DAO\SaleMemberModel::getInstance()->isJoinStore($commonInfo['store_id'],$memberId);
         //商品表
         $goodsInstance = \DAO\GoodsModel::getInstance();
-        $goods = \Our\RedisHelper::cachedFunction(\Redis\Db4\GoodsRedisModel::getInstance(),array(&$goodsInstance, 'getListAndSetStorage'),array($goodsCommonId,'goods_id,goods_price,goods_marketprice,goods_image,goods_storage,goods_spec,goods_state,goods_verify'),\Our\ApiConst::oneDaySecond,array($goodsCommonId));
+        $goods = \Our\RedisHelper::cachedFunction(\Redis\Db4\GoodsRedisModel::getInstance(),array(&$goodsInstance, 'getListAndSetStorage'),array($goodsCommonId,'goods_id,goods_price,goods_marketprice,goods_image,goods_storage,goods_spec,goods_state,goods_verify,is_del'),\Our\ApiConst::oneDaySecond,array($goodsCommonId));
         //商品图片表
         $goodsImagesInstance = \DAO\GoodsImagesModel::getInstance();
         $image = \Our\RedisHelper::cachedFunction(\Redis\Db4\GoodsImagesRedisModel::getInstance(),array(&$goodsImagesInstance, 'getListByCommonId'),array($goodsCommonId,'attr_name,attr_value,goods_image'),\Our\ApiConst::oneDaySecond,array($goodsCommonId));
@@ -1070,7 +1071,7 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
             $goodsList = [];
             foreach ($commonIds as $commonId){
                 if($goodsCommon = \Our\RedisHelper::cachedFunction(\Redis\Db4\GoodsCommonRedisModel::getInstance(),array(&$commonDAO, 'getOneById'),array($commonId),0,array($commonId))){
-                    if($goodsCommon['goods_verify'] == 1 && $goodsCommon['goods_state'] == 1) {
+                    if($goodsCommon['goods_verify'] == 1 && $goodsCommon['goods_state'] == 1 && $goodsCommon['is_del'] == 0) {
                         $goodsList[] = $goodsCommon;
                     }
                 }

application/models/DAO/Goods.php

@@ -51,7 +51,7 @@ class GoodsModel extends \DAO\AbstractModel {
      * @return mixed
      */
     public function getOnlineList($where,$field = \Our\NameConst::allField){
-        $whereSql = ' goods_state ='.\Our\ApiConst::onlineGoodsState.' and goods_verify='.\Our\ApiConst::onlineGoodsVerify;
+        $whereSql = ' goods_state ='.\Our\ApiConst::onlineGoodsState.' and goods_verify='.\Our\ApiConst::onlineGoodsVerify.' and is_del='.\Our\ApiConst::onlineGoodsDel;
         if($where){
             $whereSql .= ' and '.$where;
         }
@@ -61,6 +61,7 @@ class GoodsModel extends \DAO\AbstractModel {
     public function getOnlineOne($goodsId,$field= \Our\NameConst::allField){
         $where['goods_state'] = \Our\ApiConst::onlineGoodsState;
         $where['goods_verify'] = \Our\ApiConst::onlineGoodsVerify;
+        $where['is_del'] = \Our\ApiConst::onlineGoodsDel;
         $where['goods_id']  = $goodsId;
         $goods = \Our\RedisHelper::cachedFunction(\Redis\Db4\GoodsRedisModel::getInstance(),array(&$this, 'find'),array($where,$field),\Our\ApiConst::oneHour,array($goodsId));
         return $goods;
@@ -127,6 +128,7 @@ class GoodsModel extends \DAO\AbstractModel {
         }else{
             $where['goods_state'] = \Our\ApiConst::onlineGoodsState;
             $where['goods_verify'] = \Our\ApiConst::onlineGoodsVerify;
+            $where['is_del'] = \Our\ApiConst::onlineGoodsDel;
             $where['goods_id']  = $goodsId;
             $goods = $this->find($where,'goods_storage');
             if($goods){
@@ -285,11 +287,12 @@ class GoodsModel extends \DAO\AbstractModel {
             if(empty($onlineStorageGoods)){
                 foreach ($goodsList as $key => $goods){
                     $onlineFlag = \Our\ApiConst::zero;
-                    if($goods['goods_state'] == \Our\ApiConst::onlineGoodsState && $goods['goods_verify'] == \Our\ApiConst::onlineGoodsVerify){
+                    if($goods['goods_state'] == \Our\ApiConst::onlineGoodsState && $goods['goods_verify'] == \Our\ApiConst::onlineGoodsVerify && $goods['is_del'] == \Our\ApiConst::onlineGoodsDel){
                         $onlineFlag = \Our\ApiConst::one;
                     }
                     unset($goodsList[$key]['goods_state']);
                     unset($goodsList[$key]['goods_verify']);
+                    unset($goodsList[$key]['is_del']);
                     $data[$goods['goods_id']] = serialize(array('onlineFlag'=>$onlineFlag,'goodsStorage'=>$goods['goods_storage']));
                 }
                 $goodsRedis->tableHMSet($onlineStorageGoodsKey,$data,\Our\ApiConst::tenDaySecond);
@@ -297,6 +300,7 @@ class GoodsModel extends \DAO\AbstractModel {
                 foreach ($goodsList as $key => $goods){
                     unset($goodsList[$key]['goods_state']);
                     unset($goodsList[$key]['goods_verify']);
+                    unset($goodsList[$key]['is_del']);
                 }
             }
 

application/models/DAO/Goods/StoreTopSaleGoods.php

@@ -89,11 +89,11 @@ class StoreTopSaleGoodsModel extends \DAO\AbstractModel{
 FROM
 (
 SELECT t1.*,(SELECT COUNT(*)+1 FROM han_goods_common WHERE store_id=t1.store_id AND sale_num>t1.sale_num) AS group_id
-FROM han_goods_common t1 where t1.goods_state={1} and t1.goods_verify={2} and t1.store_id ={3}
+FROM han_goods_common t1 where t1.goods_state={1} and t1.goods_verify={2} and t1.store_id ={3} and t1.is_del ={4}
 ) 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);
+WHERE a.group_id<=3 AND a.sale_num>0 ',\Our\ApiConst::defaultGoodsScore,\Our\ApiConst::onlineGoodsState,\Our\ApiConst::onlineGoodsVerify,$storeId,\Our\ApiConst::onlineGoodsState);
         $list = $this->db->query($sql)->rows;
         return $list;
     }
@@ -112,7 +112,7 @@ LEFT JOIN han_goods_score_statistics t2
 on t1.goods_commonid = t2.goods_commonid
 where t1.
 ) a
-WHERE a.group_id<=3 AND a.sale_num>0 and a.goods_state=1 and a.goods_verify=1 ORDER BY a.store_id ,a.group_id';
+WHERE a.group_id<=3 AND a.sale_num>0 and a.goods_state=1 and a.goods_verify=1 and a.is_del=0 ORDER BY a.store_id ,a.group_id';
         $list = $this->db->query($sql)->rows;
         return $list;
     }

application/models/DAO/GoodsCommon.php

@@ -78,7 +78,7 @@ class GoodsCommonModel extends \DAO\AbstractModel {
         foreach ($where as $v){
             $str .= '->where("'.$v.'")';
         }
-        $str .="->where('goods_verify = 1')->where('goods_state = 1')";
+        $str .="->where('goods_verify = 1')->where('goods_state = 1')->where('is_del = 0')";
         if($limit){
             $str .= "->limit({$limit[0]},{$limit[1]})";
         }
@@ -114,7 +114,7 @@ class GoodsCommonModel extends \DAO\AbstractModel {
         }
         $str .= 'where ';
         if($online){
-            $str .=" (goods_verify = 1) AND (goods_state = 1) AND ";
+            $str .=" (goods_verify = 1) AND (goods_state = 1) AND (is_del = 0) AND ";
         }
         $str .= '('.implode(') AND (',$where).')';
         if($attrStr){
@@ -183,9 +183,9 @@ class GoodsCommonModel extends \DAO\AbstractModel {
     public function getCount($where,$attrStr=''){
         $this->setDb($this->dbName);
         if($attrStr){
-            return $this->db->from($this->_tableName)->join('han_goods_attribute_value','han_goods_attribute_value.goods_commonid = han_goods_common.goods_commonid')->where($where)->where($attrStr)->where(array('goods_state'=>1,'goods_verify'=>1))->fetchNum();
+            return $this->db->from($this->_tableName)->join('han_goods_attribute_value','han_goods_attribute_value.goods_commonid = han_goods_common.goods_commonid')->where($where)->where($attrStr)->where(array('goods_state'=>1,'goods_verify'=>1,'is_del'=>0))->fetchNum();
         }
-        return $this->db->from($this->_tableName)->where(array('goods_state'=>1,'goods_verify'=>1))->where($where)->fetchNum();
+        return $this->db->from($this->_tableName)->where(array('goods_state'=>1,'goods_verify'=>1,'is_del'=>0))->where($where)->fetchNum();
     }
     /**
      * 获取分享信息