Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
my-yaf-project
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
chenchuanwen
my-yaf-project
Commits
a3e52cc5
Commit
a3e52cc5
authored
Jan 09, 2019
by
zhz
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into zhz
parents
626270fc
c02c025d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
StoreService.php
application/models/Business/Store/StoreService.php
+1
-1
No files found.
application/models/Business/Store/StoreService.php
View file @
a3e52cc5
...
@@ -1011,7 +1011,7 @@ class StoreServiceModel extends \Business\AbstractModel{
...
@@ -1011,7 +1011,7 @@ class StoreServiceModel extends \Business\AbstractModel{
foreach
(
$signClassStores
as
$signClass
){
foreach
(
$signClassStores
as
$signClass
){
$inAreaFlag
=
\Our\CommonExtension
::
locationInArea
(
$position
[
'lat'
],
$position
[
'lng'
],
$signClass
[
'sign_scope'
]);
$inAreaFlag
=
\Our\CommonExtension
::
locationInArea
(
$position
[
'lat'
],
$position
[
'lng'
],
$signClass
[
'sign_scope'
]);
if
(
$inAreaFlag
){
if
(
$inAreaFlag
){
if
(
$return
[
$signClass
[
'gc_id'
]]
){
if
(
isset
(
$return
[
$signClass
[
'gc_id'
]])
){
continue
;
continue
;
}
}
$return
[
$signClass
[
'gc_id'
]]
=
$signClass
[
'store_id'
];
$return
[
$signClass
[
'gc_id'
]]
=
$signClass
[
'store_id'
];
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment