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

application/models/Business/Goods/GoodsCommonService.php

@@ -1057,7 +1057,24 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
     }
 
     public function checkRemoveOnlineGoodsClass($goodsClass){
-
+        $goodsCommonDao = \DAO\GoodsCommonModel::getInstance();
+        $storeOnlineGoodsClassDao = \DAO\GoodsClass\StoreOnlineGoodsClassModel::getInstance();
+        if($goodsClass){
+            $gcFrom = $goodsClass['gc_from'];
+            $where['gc_id_1'] = $goodsClass['gc_id_1'];
+            $where['gc_id_2'] = $goodsClass['gc_id_2'];
+            $where['gc_id_3'] = $goodsClass['gc_id_3'];
+            $where['store_id'] = $goodsClass['store_id'];
+            $where['goods_state'] = \Our\ApiConst::onlineGoodsState;
+            $where['goods_verify'] = \Our\ApiConst::onlineGoodsVerify;
+            if($gcFrom==\Our\ApiConst::one){
+                $where['goods_class_t_id'] = $goodsClass['gc_id_3'];
+            }
+            $tempOne = $goodsCommonDao->getOne($where,'goods_commonid');
+            if(!$tempOne){
+                $storeOnlineGoodsClassDao->del($goodsClass);
+            }
+        }
     }
 
     private static $_instance = null;

application/models/Business/User/MemberService.php

@@ -209,7 +209,10 @@ class MemberServiceModel extends \Business\AbstractModel
      * 退出登录
      */
     public function logOut($key){
-        $result = \Redis\Db0\SessionRedisModel::getInstance()->delSessionKey($key);
+        $sessionRedis = \Redis\Db0\SessionRedisModel::getInstance();
+        $resultTemp = $sessionRedis->tableDel($key);
+        $result = $sessionRedis->delSessionKey($key);
+        \Our\Log::getInstance()->write($resultTemp.' '.$result.'  test');
         return $result;
     }
 

application/models/DAO/GoodsClass/StoreOnlineGoodsClass.php

@@ -44,6 +44,16 @@ class StoreOnlineGoodsClassModel extends \DAO\AbstractModel{
         return $result ;
     }
 
+
+    public function del($where){
+        $this->setDb(\Our\DbNameConst::masterDBConnectName);
+        $temp = $this->findByWhere($where);
+
+        $result  = $this->db->delete($this->_tableName)->where($where)->execute();
+        return $result;
+    }
+
+
     public function getList($where,$field = \Our\NameConst::allField){
         $this->setDb($this->dbName);
         $result = $this->db->select($field)->from($this->_tableName)->where($where)->fetchAll();

application/models/DAO/GoodsCommon.php

@@ -30,6 +30,10 @@ class GoodsCommonModel extends \DAO\AbstractModel {
         return $this->db->select($field)->from($this->_tableName)->where(array('goods_commonid'=>$goodsCommonId))->fetchOne();
     }
 
+    public function getOne($where,$field = \Our\NameConst::allField){
+        $this->setDb($this->dbName);
+        return $this->db->select($field)->from($this->_tableName)->where($where)->fetchOne();
+    }
     public function getGoodsSaleNumFromCache($goodsCommonId){
         $goodsCommonRedis = \Redis\Db4\GoodsCommonRedisModel::getInstance();
         $onlineGoodsCommonSaleNumKey = \Our\NameConst::onlineGoodsCommonSaleNumPrefix;