Commit 08a5dbc4 authored by zhz's avatar zhz

store

parent 15dd1331
...@@ -10,10 +10,10 @@ class StoreController extends \Our\Controller_AbstractIndex { ...@@ -10,10 +10,10 @@ class StoreController extends \Our\Controller_AbstractIndex {
$this->memberId=$this->sess->get('member_id'); $this->memberId=$this->sess->get('member_id');
} }
/** /**
* 获取店铺首页头部(公用) * 获取店铺首页头部
*/ */
public function getStoreInfoAction(){ public function getStoreInfoAction(){
$address = \Business\User\AddressServiceModel::getInstance()->getMyAddress($this->req[\Our\NameConst::data],$this->memberId); $address = \Business\User\AddressServiceModel::getInstance()->getMyAddress($this->req[\Our\NameConst::data],$this->memberId,false);
$storeInfo = $this->storeService->getStoreInfo($this->req[\Our\NameConst::data],$this->memberId, $address); $storeInfo = $this->storeService->getStoreInfo($this->req[\Our\NameConst::data],$this->memberId, $address);
$storeInfo['share'] = \Business\Common\CommonServiceModel::getInstance()->getShareInfo(\Our\ApiConst::shareStore,$this->req[\Our\NameConst::data]['storeId']); $storeInfo['share'] = \Business\Common\CommonServiceModel::getInstance()->getShareInfo(\Our\ApiConst::shareStore,$this->req[\Our\NameConst::data]['storeId']);
$this->success($storeInfo); $this->success($storeInfo);
......
...@@ -91,11 +91,6 @@ class GoodsBrowseModel extends \DAO\AbstractModel { ...@@ -91,11 +91,6 @@ class GoodsBrowseModel extends \DAO\AbstractModel {
public function getDistinctDate($member_id,$startTime,$endTime,$order){ public function getDistinctDate($member_id,$startTime,$endTime,$order){
$this->setDb(); $this->setDb();
$data = $this->db->select('DISTINCT browsedate')->from($this->_tableName)->where("member_id={$member_id}")->where("browsedate BETWEEN {$startTime} AND {$endTime}")->order($order[0],$order[1])->fetchAll(); $data = $this->db->select('DISTINCT browsedate')->from($this->_tableName)->where("member_id={$member_id}")->where("browsedate BETWEEN {$startTime} AND {$endTime}")->order($order[0],$order[1])->fetchAll();
if($data) {
foreach ($data as &$v) {
$v['browsedate'] = (int)$v['browsedate'];
}
}
return $data; return $data;
} }
public function delete($where){ public function delete($where){
......
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