Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
soss
Overview
Overview
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
hooloo
ms
soss
Commits
8c9207ad
Commit
8c9207ad
authored
Mar 06, 2023
by
weijiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
恢复部分代码
parent
d26ca9b0
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
0 deletions
+4
-0
soss-system/src/main/java/com/soss/system/service/impl/AppServiceImpl.java
+4
-0
No files found.
soss-system/src/main/java/com/soss/system/service/impl/AppServiceImpl.java
View file @
8c9207ad
...
@@ -11,6 +11,7 @@ import com.soss.system.domain.vo.LocationVo;
...
@@ -11,6 +11,7 @@ import com.soss.system.domain.vo.LocationVo;
import
com.soss.system.mapper.ShopMapper
;
import
com.soss.system.mapper.ShopMapper
;
import
com.soss.system.utils.AreaUtil
;
import
com.soss.system.utils.AreaUtil
;
import
com.soss.system.utils.DistanceUtil
;
import
com.soss.system.utils.DistanceUtil
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.lang3.BooleanUtils
;
import
org.apache.commons.lang3.BooleanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
...
@@ -22,6 +23,7 @@ import java.util.Comparator;
...
@@ -22,6 +23,7 @@ import java.util.Comparator;
import
java.util.List
;
import
java.util.List
;
@Service
@Service
@Slf4j
public
class
AppServiceImpl
{
public
class
AppServiceImpl
{
@Autowired
@Autowired
private
ShopMapper
shopMapper
;
private
ShopMapper
shopMapper
;
...
@@ -35,6 +37,7 @@ public class AppServiceImpl {
...
@@ -35,6 +37,7 @@ public class AppServiceImpl {
public
Shop
getShop
(
LoginUser
loginUser
,
String
lng
,
String
lat
,
Boolean
testFlag
)
throws
ParseException
{
public
Shop
getShop
(
LoginUser
loginUser
,
String
lng
,
String
lat
,
Boolean
testFlag
)
throws
ParseException
{
Shop
shop
=
null
;
Shop
shop
=
null
;
if
(
StringUtils
.
isEmpty
(
lng
)
||
StringUtils
.
isEmpty
(
lat
))
{
if
(
StringUtils
.
isEmpty
(
lng
)
||
StringUtils
.
isEmpty
(
lat
))
{
log
.
info
(
"getShop lng&lat is null"
);
// 未授权位置
// 未授权位置
if
(
loginUser
==
null
)
{
if
(
loginUser
==
null
)
{
// 未登录,返回默认店铺
// 未登录,返回默认店铺
...
@@ -53,6 +56,7 @@ public class AppServiceImpl {
...
@@ -53,6 +56,7 @@ public class AppServiceImpl {
}
}
}
else
{
}
else
{
// 授权了位置
// 授权了位置
log
.
info
(
"getShop lng={}, lat={}"
,
lng
,
lat
);
List
<
Integer
>
states
=
null
;
List
<
Integer
>
states
=
null
;
if
(
BooleanUtils
.
isTrue
(
testFlag
))
{
if
(
BooleanUtils
.
isTrue
(
testFlag
))
{
states
=
Arrays
.
asList
(
ShopState
.
TESTING
.
getState
(),
ShopState
.
OPEN
.
getState
());
states
=
Arrays
.
asList
(
ShopState
.
TESTING
.
getState
(),
ShopState
.
OPEN
.
getState
());
...
...
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