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

application/models/Business/Goods/GoodsClassService.php

@@ -255,7 +255,7 @@ class GoodsClassServiceModel extends \Business\AbstractModel{
     public function getStoreTopClasses($data){
         $storeOnlineGoodsClassDao = \DAO\GoodsClass\StoreOnlineGoodsClassModel::getInstance();
         $storeOnlineGoodsClassDao->checkStoreTopClasses($data);
-        $list = \Our\RedisHelper::cachedFunction(\Redis\Db6\StoreOnlineGoodsClassRedisModel::getInstance(),array(&$storeOnlineGoodsClassDao, 'getList'),array(array('store_id'=>$data['storeId']),'distinct(gc_id_1) as gcId'),\Our\ApiConst::oneHour);
+        $list = \Our\RedisHelper::cachedFunction(\Redis\Db6\StoreOnlineGoodsClassRedisModel::getInstance(),array(&$storeOnlineGoodsClassDao, 'getList'),array(array('store_id'=>$data['storeId']),'distinct(gc_id_1) as gcId'),\Our\ApiConst::oneHour,array($data['storeId']));
         $returnClasses = array();
         if($list){
             $goodsClassDao = \DAO\GoodsClassModel::getInstance();

application/models/Business/User/AddressService.php

@@ -184,6 +184,7 @@ class AddressServiceModel extends \Business\AbstractModel {
                 $address = array();
                 $address['addressId']= $newAddressList[$pos]['address_id'];
                 $address['address']= $newAddressList[$pos]['address'];
+                $address['name'] = $newAddressList[$pos]['name'];
                 $address['tagType']= $newAddressList[$pos]['tag_type'];
                 $choosedAddressId = $address['addressId'];
                 $newAddress = $address;

application/models/DAO/GoodsClass/StoreOnlineGoodsClass.php

@@ -27,7 +27,8 @@ class StoreOnlineGoodsClassModel extends \DAO\AbstractModel{
 
     public function getList($where,$field = \Our\NameConst::allField){
         $this->setDb($this->dbName);
-        return $this->db->select($field)->from($this->_tableName)->where($where)->fetchAll();
+        $result = $this->db->select($field)->from($this->_tableName)->where($where)->fetchAll();
+        return $result;
     }