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
a85e0f6d
Commit
a85e0f6d
authored
Dec 04, 2018
by
zhz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
inservice
parent
1484a387
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
12 deletions
+10
-12
GoodsCommonService.php
application/models/Business/Goods/GoodsCommonService.php
+2
-6
GroupSaleService.php
application/models/Business/Goods/GroupSaleService.php
+8
-6
No files found.
application/models/Business/Goods/GoodsCommonService.php
View file @
a85e0f6d
...
...
@@ -496,12 +496,8 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
$lng
=
$param
[
'lng'
];
$lat
=
$param
[
'lat'
];
}
$in_store_service_flag
=
0
;
if
(
$lng
&&
$lat
){
$location
=
array
(
'lat'
=>
$lat
,
'lng'
=>
$lng
);
$in_store_service
=
\Store\StoreUtil
::
getInstance
()
->
checkAddressInServiceArea
(
$location
,
$commonInfo
[
'store_id'
]);
$in_store_service
&&
$in_store_service_flag
=
1
;
}
$storeInfo
=
\DAO\StoreModel
::
getInstance
()
->
get
(
$commonInfo
[
'store_id'
],
false
);
$in_store_service_flag
=
\DAO\StoreModel
::
getInstance
()
->
checkAddressInServiceArea
(
array
(
'lng'
=>
$lng
,
'lat'
=>
$lat
),
$storeInfo
);
//所在地
$area
=
''
;
if
(
$commonInfo
[
'areaid_1'
]
&&
$commonInfo
[
'areaid_2'
]){
...
...
application/models/Business/Goods/GroupSaleService.php
View file @
a85e0f6d
...
...
@@ -38,12 +38,14 @@ class GroupSaleServiceModel extends \Business\AbstractModel {
$lng
=
$param
[
'lng'
];
$lat
=
$param
[
'lat'
];
}
$in_store_service_flag
=
0
;
if
(
$lng
&&
$lat
){
$location
=
array
(
'lat'
=>
$lat
,
'lng'
=>
$lng
);
$in_store_service
=
\Store\StoreUtil
::
getInstance
()
->
checkAddressInServiceArea
(
$location
,
$data
[
'store_id'
]);
$in_store_service
&&
$in_store_service_flag
=
1
;
}
// $in_store_service_flag=0;
// if($lng && $lat){
// $location = array('lat'=>$lat,'lng'=>$lng);
// $in_store_service = \Store\StoreUtil::getInstance()->checkAddressInServiceArea($location,$data['store_id']);
// $in_store_service && $in_store_service_flag = 1;
// }
$storeInfo
=
\DAO\StoreModel
::
getInstance
()
->
get
(
$data
[
'store_id'
],
false
);
$in_store_service_flag
=
\DAO\StoreModel
::
getInstance
()
->
checkAddressInServiceArea
(
array
(
'lng'
=>
$lng
,
'lat'
=>
$lat
),
$storeInfo
);
$data
[
'inStoreService'
]
=
$in_store_service_flag
;
$data
[
'state'
]
=
\Our\ApiConst
::
cartGoodsOnline
;
...
...
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