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
b02c7644
Commit
b02c7644
authored
Nov 24, 2018
by
christ
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into ccw
parents
0bff0b82
b2ad9398
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
2 deletions
+1
-2
GoodsClassService.php
application/models/Business/Goods/GoodsClassService.php
+1
-2
No files found.
application/models/Business/Goods/GoodsClassService.php
View file @
b02c7644
...
...
@@ -71,7 +71,6 @@ class GoodsClassServiceModel extends \Business\AbstractModel{
}
//获取当前城市可用签约分类
$signStoreInfo
=
$this
->
getSignStoreInfo
(
$where
);
$signStoreIds
=
$signStoreInfo
[
'signStoreIds'
];
//当前位置签约店铺ID
$signParentClassIds
=
$signStoreInfo
[
'signParentClassIds'
];
//当前位置签约分类对应一级分类
$classIds
=
array
();
...
...
@@ -164,7 +163,7 @@ class GoodsClassServiceModel extends \Business\AbstractModel{
$serviceStoreIds
=
array
();
if
(
$storeList
){
foreach
(
$storeList
as
$key
=>
$store
){
$result
=
\Store\StoreUtil
::
getInstance
()
->
checkAddressInServiceAreaByStore
(
array
(
'lng'
=>
$where
[
'lng'
],
'lat'
=>
$where
[
'lat'
]),
$storeIndexList
[
$
tempS
tore
[
'store_id'
]]);
$result
=
\Store\StoreUtil
::
getInstance
()
->
checkAddressInServiceAreaByStore
(
array
(
'lng'
=>
$where
[
'lng'
],
'lat'
=>
$where
[
'lat'
]),
$storeIndexList
[
$
s
tore
[
'store_id'
]]);
if
(
$result
){
$serviceStoreIds
[]
=
$store
[
'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