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

application/controllers/Store.php

@@ -13,7 +13,8 @@ class StoreController extends \Our\Controller_AbstractIndex {
      * 获取店铺首页头部(公用)
      */
     public function getStoreInfoAction(){
-        $storeInfo = $this->storeService->getStoreInfo($this->req[\Our\NameConst::data],$this->memberId);
+        $address = \Business\User\AddressServiceModel::getInstance()->getMyAddress($this->req[\Our\NameConst::data],$this->memberId);
+        $storeInfo = $this->storeService->getStoreInfo($this->req[\Our\NameConst::data],$this->memberId, $address);
         //.
         $storeInfo['adv'] = array('href'=>'','imageUrl'=>'http://qmoss-01.oss-cn-hangzhou.aliyuncs.com/data/upload/mall/adv/05715960161498410.jpg');
         $storeInfo['share'] = \Business\Common\CommonServiceModel::getInstance()->getShareInfo(\Our\ApiConst::shareStore,$this->req[\Our\NameConst::data]['storeId']);

application/models/Business/Store/StoreService.php

@@ -37,13 +37,18 @@ class StoreServiceModel extends \Business\AbstractModel{
      * @param $store_id
      * @param $memberId
      */
-    public function getStoreInfo($param,$memberId){
+    public function getStoreInfo($param,$memberId,$address){
         $storeId = intval($param['storeId']);
         if(!$storeId){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyStoreId);
         }
-        $lng = $param['lng'];
-        $lat = $param['lat'];
+        if($address) {
+            $lng = $address['lng'];
+            $lat = $address['lat'];
+        }else{
+            $lng = $param['lng'];
+            $lat = $param['lat'];
+        }
         if(!$lng || !$lat){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyLatLngParam);
         }