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
a31db60a
Commit
a31db60a
authored
Dec 29, 2018
by
liuyuzhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
暂无相关店铺
parent
dfe8981d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
5 deletions
+2
-5
GoodsClassService.php
application/models/Business/Goods/GoodsClassService.php
+2
-5
No files found.
application/models/Business/Goods/GoodsClassService.php
View file @
a31db60a
...
...
@@ -82,7 +82,6 @@ class GoodsClassServiceModel extends \Business\AbstractModel{
if
(
$serviceStoreIds
&&
$signStoreIds
){
$serviceStoreIds
=
array_diff
(
$serviceStoreIds
,
$signStoreIds
);
}
$serviceParentClassIds
=
$this
->
getServiceStoreClasses
(
$serviceStoreIds
);
if
(
$serviceParentClassIds
){
$classIds
=
array_merge
(
$serviceParentClassIds
,
$classIds
);
...
...
@@ -202,9 +201,9 @@ class GoodsClassServiceModel extends \Business\AbstractModel{
$newStoreIds
=
array
();
foreach
(
$signStoreClasses
as
$signClass
){
$inAreaFlag
=
\Our\CommonExtension
::
locationInArea
(
$lat
,
$lng
,
$signClass
[
'sign_scope'
]);
$store
=
$storeList
[
$signClass
[
'store_id'
]];
//判断签约分类是否可以为当前用户提供服务,并且记录这些店铺对应的store_id
if
(
$inAreaFlag
){
$store
=
$storeList
[
$signClass
[
'store_id'
]];
if
(
$inAreaFlag
&&
$store
){
$class_distance
=
\Our\CommonExtension
::
getDistance
(
$lat
,
$lng
,
$store
[
'store_latitude'
],
$store
[
'store_latitude'
],
1
);
$class
=
$signClass
;
$class
[
'class_distance'
]
=
$class_distance
;
...
...
@@ -215,14 +214,12 @@ class GoodsClassServiceModel extends \Business\AbstractModel{
}
}
foreach
(
$returnClass
as
$key
=>
$class
){
$classDistance
[
$key
]
=
$class
[
'class_distance'
];
}
array_multisort
(
$classDistance
,
SORT_DESC
,
$returnClass
);
$signParentClassIds
=
array_unique
(
array_column
(
$returnClass
,
'gc_parent_id'
));
//$signStoreIds = array_unique(array_column($returnClass,'store_id'));
$signStoreIds
=
$newStoreIds
;
//将当前位置对应签约店铺存入缓存
...
...
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