Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
caosy
/
fun-golf-mobile
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
1
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
2494c32f
authored
Nov 14, 2018
by
chongli
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'f-6.7.0' of 192.168.10.6:caosy/fun-golf-mobile into f-6.7.0
parents
7a5db328
011a35e1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
src/main/java/com/ctrip/fun/golf/api/product/AdvertisementMController.java
src/main/java/com/ctrip/fun/golf/api/product/AdvertisementMController.java
View file @
2494c32f
...
...
@@ -319,11 +319,11 @@ public class AdvertisementMController {
double
minDistance
=
0
;
DistrictBean
cityBean
=
new
DistrictBean
();
minDistance
=
MathUtil
.
GetDistance
(
BJBean
.
getLat
(),
BJBean
.
getLng
(),
lat
,
lng
);
BigDecimal
initDis
=
new
BigDecimal
(
minDistance
);
BigDecimal
initDis
=
new
BigDecimal
(
minDistance
)
.
setScale
(
4
,
BigDecimal
.
ROUND_HALF_UP
)
;
for
(
int
i
=
0
;
i
<
cityList
.
size
();
i
++)
{
cityBean
=
cityList
.
get
(
i
);
double
distance
=
MathUtil
.
GetDistance
(
cityBean
.
getLat
(),
cityBean
.
getLng
(),
lat
,
lng
);
BigDecimal
newDis
=
new
BigDecimal
(
distance
);
BigDecimal
newDis
=
new
BigDecimal
(
distance
)
.
setScale
(
4
,
BigDecimal
.
ROUND_HALF_UP
)
;
if
(
newDis
.
compareTo
(
BigDecimal
.
ZERO
)==
0
){
cityId
=
cityBean
.
getId
();
break
;
...
...
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