店铺首页切换内容未切换错误

application/controllers/Home.php

@@ -23,21 +23,21 @@ class HomeController extends \Our\Controller_AbstractIndex{
         }
         $returnData['currentAddress'] = $currentAddress;
 
-        $currentAddress = $this->sess->get('currentAddress');
-
+        $data = $this->req[\Our\NameConst::data];
+        $requestAddress = \Business\User\AddressServiceModel::getInstance()->getRequestAddress($data,$currentAddress);
         //获取首页推荐分类
-        $resultClasses = $this->getPlatformGoodsClassAction(true);
+        $resultClasses = $this->getPlatformGoodsClassAction($requestAddress);
         if($resultClasses){
             $returnData['recommendClasses'] = $resultClasses;
         }
 
         //获取当前位置对应附近店铺
 
-        $nearbyStores = $this->getNearbyStoresAction(true);
+        $nearbyStores = $this->getNearbyStoresAction($requestAddress);
         $returnData['nearbyStores'] = $nearbyStores;
 
         //获取附近店铺对应的商品
-        $recommendGoods = $this->getIndexHotSalesGoodsAction(true);
+        $recommendGoods = $this->getIndexHotSalesGoodsAction($requestAddress);
 
         $returnData['recommendGoods'] = $recommendGoods;
 
@@ -46,6 +46,8 @@ class HomeController extends \Our\Controller_AbstractIndex{
         $this->success($returnData);
     }
 
+
+
     /**
      * 设置当前地址
      * @param bool $flag
@@ -67,11 +69,14 @@ class HomeController extends \Our\Controller_AbstractIndex{
      * @param bool $flag
      * @return array
      */
-    public function getIndexHotSalesGoodsAction($flag = false){
+    public function getIndexHotSalesGoodsAction($address = false){
         $currentAddress = $this->sess->get('currentAddress');
+        if($address){
+            $currentAddress = $address ;
+        }
         $goodsCommonService = \Business\Goods\GoodsCommonServiceModel::getInstance();
         $recommendGoods = $goodsCommonService->getIndexHotSalesGoods($currentAddress);
-        if($flag){
+        if($address){
             return $recommendGoods;
         }
         $this->success($recommendGoods);
@@ -82,11 +87,14 @@ class HomeController extends \Our\Controller_AbstractIndex{
      * @param bool $flag
      * @return array
      */
-    public function getNearbyStoresAction($flag = false){
+    public function getNearbyStoresAction($address = false){
         $currentAddress = $this->sess->get('currentAddress');
+        if($address){
+            $currentAddress = $address ;
+        }
         $storesService = \Business\Store\StoreServiceModel::getInstance();
         $nearbyStores = $storesService->getNearbyStores($currentAddress);
-        if($flag){
+        if($address){
             return $nearbyStores;
         }
         $this->success($nearbyStores);
@@ -98,11 +106,14 @@ class HomeController extends \Our\Controller_AbstractIndex{
      * @param bool $flag
      * @return array
      */
-    public function getPlatformGoodsClassAction($flag = false){
+    public function getPlatformGoodsClassAction($address = false){
         $currentAddress = $this->sess->get('currentAddress');
+        if($address){
+            $currentAddress = $address ;
+        }
         $goodsClassService = \Business\Goods\GoodsClassServiceModel::getInstance();
         $resultClasses = $goodsClassService->getHomeIndexGoodsClasses($currentAddress);
-        if($flag){
+        if($address){
             return $resultClasses;
         }
         $this->success($resultClasses);

application/models/Business/Store/StoreService.php

@@ -398,7 +398,6 @@ class StoreServiceModel extends \Business\AbstractModel{
         if(!$nearbyStoreIds){
             return array('totalCount'=>0);
         }
-
         $storeRedis = \Redis\Db6\StoreRedisModel::getInstance();
         $storeDao = \DAO\StoreModel::getInstance();
 
@@ -483,7 +482,6 @@ class StoreServiceModel extends \Business\AbstractModel{
         $position['lng'] = $where['lng'];
         $position['cityCode'] = $where['cityCode'];
         $readisSuffix = crc32(serialize(ksort($position)));
-
         $storeRedis = \Redis\Db6\StoreRedisModel::getInstance();
 
         $nearbyStoreKey = \Our\NameConst::nearbyStoreKeyPrefix . $readisSuffix;

application/models/Business/User/AddressService.php

@@ -16,6 +16,25 @@ class AddressServiceModel extends \Business\AbstractModel {
     {
     }
 
+
+    public function getRequestAddress($data,$returnAddress){
+        $returnData = array();
+        if($returnAddress['returnAddressId'] > \Our\ApiConst::zero){
+            $returnData['lat'] = $returnAddress['addresses'][0]['lat'];
+            $returnData['lng'] = $returnAddress['addresses'][0]['lng'];
+            $returnData['cityCode'] = $returnAddress['addresses'][0]['cityCode'];
+        }else {
+            if($data['cityCode']&&$data['lng']&&$data['lat']){
+                $returnData = $data;
+            }else{
+                $returnData = \Our\ArrayConst::defaultAddress;
+                unset($returnData['address']);
+                unset($returnData['default']);
+            }
+        }
+        return $returnData;
+    }
+
     public function writeToFile(){
 
         $addressDao = \DAO\AreaModel::getInstance();

application/models/DAO/QmStoreClass.php

@@ -33,7 +33,6 @@ class QmStoreClassModel extends \DAO\AbstractModel{
         }else{
             $result = $this->db->select($field)->from($this->_tableName)->where($where)->fetchAll();
         }
-
         return $result;
     }