Commit 49c4b5c5 authored by wwccw0591's avatar wwccw0591

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

parents 89d26ad3 c68aa627
......@@ -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();
......
......@@ -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;
......
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment