测试

application/models/Business/Store/ClassStoreService.php

@@ -43,28 +43,36 @@ class ClassStoreServiceModel extends \Business\AbstractModel{
         $newGcStoreList = array();
         if($storeList){
             $newStoreList = array();
+            $newGcList = array();
             foreach($storeList as $store){
                 $gcId = $store['gcId'];
                 $store_lat = $store['store_latitude'];
                 $store_lnt = $store['store_longitude'];
+                $gcName = htmlspecialchars_decode($store['gcName']);
                 unset($store['store_latitude']);
                 unset($store['store_longitude']);
+                unset($store['gcId']);
+                unset($store['gcName']);
                 $store['storeLabel'] =\Our\ImageUtil::getStoreLabel($store['storeLabel'], \Our\ImageConst::storeLabel,213);
                 $store['storeDistance'] = \Our\CommonExtension::getDistance($lat,$lng,$store_lat,$store_lnt);
-                $newStoreList[$store['storeId']] = $store;
+                if(!isset($newStoreList[$store['storeId']])){
+                    $newStoreList[$store['storeId']] = $store;
+                }
+                if(!isset($newGcList[$gcId])){
+                    $newGcList[$gcId] = $gcName;
+                }
                 if(isset($newGcStoreList[$gcId]['inAreaFlag'])){
                     continue;
                 }
+
                 $inAreaFlag = false;
                 if(isset($store['sign_scope'])&&$store['sign_scope']){
                     $inAreaFlag = \Our\CommonExtension::locationInArea($lat,$lng,$store['sign_scope']);
                 }
                 if(!isset($newGcStoreList[$gcId])){
-                    $newGcStoreList[$gcId]['gcName'] = htmlspecialchars_decode($store['gcName']);
-                    $newGcStoreList[$gcId]['gcImg'] = \Our\ImageUtil::getCategoryHeadPic($gcId);// \Our\Common::getStaticFile(\Our\ImageConst::categoryHeadPicPrefix.$gcId.\Our\NameConst::jpgSuffix,\Our\ImageConst::defaultPath);
+                    $newGcStoreList[$gcId]['gcName'] = $gcName;
+                    $newGcStoreList[$gcId]['gcImg'] = \Our\ImageUtil::getCategoryHeadPic($gcId);
                 }
-                unset($store['gcName']);
-                unset($store['gcId']);
                 if($inAreaFlag){
                     $newGcStoreList[$gcId]['inAreaFlag'] = $inAreaFlag;
                     $newGcStoreList[$gcId]['stores']= $store;
@@ -85,8 +93,8 @@ class ClassStoreServiceModel extends \Business\AbstractModel{
                 foreach($memberStores as $key => $storeId){
                     $returnData[$key] = array();
                     $purchasedStore = $newStoreList[$storeId];
-                    $returnData[$key]['gcName'] = htmlspecialchars_decode($purchasedStore['gcName']);
-                    $returnData[$key]['gcImg'] = \Our\ImageUtil::getCategoryHeadPic($purchasedStore['gcId']);//\Our\Common::getStaticFile(\Our\ImageConst::categoryHeadPicPrefix.$purchasedStore['gcId'].\Our\NameConst::jpgSuffix,\Our\ImageConst::defaultPath);
+                    $returnData[$key]['gcName'] = $newGcList[$key];
+                    $returnData[$key]['gcImg'] = \Our\ImageUtil::getCategoryHeadPic($key);
                     unset($purchasedStore['gcName']);
                     unset($purchasedStore['gcId']);
                     $purchasedStore['isPurchased'] = \Our\ApiConst::one;
@@ -109,7 +117,10 @@ class ClassStoreServiceModel extends \Business\AbstractModel{
                     $returnData[$gcIdKey] = $storeInfo;
                 }
             }
-            $return = array_values($returnData);
+            $return = array();
+            foreach($newGcList as $key=>$gcNameTemp){
+                array_push($return,$returnData[$key]);
+            }
             foreach($return as &$temp){
                 $temp['stores'] = array_values($temp['stores']);
             }

conf/application.ini

@@ -390,21 +390,21 @@ elastic.master.scheme="http";
 [lyztest : common]
 ; 数据库配置
 resources.database.params.driver   = "pdo_mysql"
-resources.database.params.hostname = "127.0.0.1"
+resources.database.params.hostname = "106.14.14.233"
 resources.database.params.port     = 3306
-resources.database.params.database = "testqmcs"
+resources.database.params.database = "qmcs"
 resources.database.params.username = "root"
-resources.database.params.password = "123456"
+resources.database.params.password = "!@#$%12345werty"
 resources.database.params.charset  = "UTF8"
 resources.database.params.driver_options.1002 = "SET NAMES utf8"
 
 ; 从库配置
 resources.database.slave.params.driver   = "pdo_mysql"
-resources.database.slave.params.hostname = "127.0.0.1"
+resources.database.slave.params.hostname = "106.14.14.233"
 resources.database.slave.params.port     = 3306
-resources.database.slave.params.database = "testqmcs"
+resources.database.slave.params.database = "qmcs"
 resources.database.slave.params.username = "root"
-resources.database.slave.params.password = "123456"
+resources.database.slave.params.password = "!@#$%12345werty"
 resources.database.slave.params.charset  = "UTF8"
 resources.database.slave.params.driver_options.1002 = "SET NAMES utf8"