Commit c02c025d authored by liuyuzhen's avatar liuyuzhen

测试

parent f4709d26
......@@ -1011,7 +1011,7 @@ class StoreServiceModel extends \Business\AbstractModel{
foreach($signClassStores as $signClass){
$inAreaFlag = \Our\CommonExtension::locationInArea($position['lat'],$position['lng'],$signClass['sign_scope']);
if($inAreaFlag){
if($return[$signClass['gc_id']]){
if(isset($return[$signClass['gc_id']])){
continue;
}
$return[$signClass['gc_id']] = $signClass['store_id'];
......
......@@ -450,7 +450,7 @@ elastic.master.scheme="http";
resources.database.params.driver = "pdo_mysql"
resources.database.params.hostname = "127.0.0.1"
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.charset = "UTF8"
......@@ -460,7 +460,7 @@ 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.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.charset = "UTF8"
......
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