Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
xyqb-user2
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
head_group
xyqb-user2
Commits
70f2515b
Commit
70f2515b
authored
Aug 31, 2017
by
Java—红包—徐 然
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
f38a260c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
2 deletions
+9
-2
PlatformAPIController.java
...b/controller/internal/platform/PlatformAPIController.java
+9
-2
No files found.
src/main/java/cn/quantgroup/xyqb/controller/internal/platform/PlatformAPIController.java
View file @
70f2515b
...
@@ -4,11 +4,13 @@ import cn.quantgroup.xyqb.controller.IBaseController;
...
@@ -4,11 +4,13 @@ import cn.quantgroup.xyqb.controller.IBaseController;
import
cn.quantgroup.xyqb.entity.Merchant
;
import
cn.quantgroup.xyqb.entity.Merchant
;
import
cn.quantgroup.xyqb.entity.MerchantConfig
;
import
cn.quantgroup.xyqb.entity.MerchantConfig
;
import
cn.quantgroup.xyqb.entity.User
;
import
cn.quantgroup.xyqb.entity.User
;
import
cn.quantgroup.xyqb.entity.UserDetail
;
import
cn.quantgroup.xyqb.model.JsonResult
;
import
cn.quantgroup.xyqb.model.JsonResult
;
import
cn.quantgroup.xyqb.model.Tuple
;
import
cn.quantgroup.xyqb.model.Tuple
;
import
cn.quantgroup.xyqb.service.merchant.IMerchantService
;
import
cn.quantgroup.xyqb.service.merchant.IMerchantService
;
import
cn.quantgroup.xyqb.service.page.IPageService
;
import
cn.quantgroup.xyqb.service.page.IPageService
;
import
cn.quantgroup.xyqb.service.page.bean.PageType
;
import
cn.quantgroup.xyqb.service.page.bean.PageType
;
import
cn.quantgroup.xyqb.service.user.IUserDetailService
;
import
com.google.common.collect.ImmutableMap
;
import
com.google.common.collect.ImmutableMap
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang.StringUtils
;
...
@@ -33,6 +35,8 @@ public class PlatformAPIController implements IBaseController {
...
@@ -33,6 +35,8 @@ public class PlatformAPIController implements IBaseController {
private
IPageService
pageService
;
private
IPageService
pageService
;
@Autowired
@Autowired
private
IMerchantService
merchantService
;
private
IMerchantService
merchantService
;
@Autowired
private
IUserDetailService
userDetailService
;
@RequestMapping
(
"/page/return_url"
)
@RequestMapping
(
"/page/return_url"
)
public
JsonResult
returnUrl
(
String
key
)
{
public
JsonResult
returnUrl
(
String
key
)
{
...
@@ -56,7 +60,7 @@ public class PlatformAPIController implements IBaseController {
...
@@ -56,7 +60,7 @@ public class PlatformAPIController implements IBaseController {
Tuple
<
String
,
Boolean
>
nextPageTuple
=
pageService
.
nextPage
(
user
,
target
,
currentPage
);
Tuple
<
String
,
Boolean
>
nextPageTuple
=
pageService
.
nextPage
(
user
,
target
,
currentPage
);
Boolean
isFinal
=
nextPageTuple
.
getValue
();
Boolean
isFinal
=
nextPageTuple
.
getValue
();
String
nextPage
=
nextPageTuple
.
getKey
();
String
nextPage
=
nextPageTuple
.
getKey
();
if
(
"xyqb"
.
equals
(
key
)){
if
(
"xyqb"
.
equals
(
key
)
&&
canPass
(
user
)
){
MerchantConfig
merchantConfig
=
merchantService
.
findConfigByMerchantIdAndConfigName
(
4L
,
"returnUrl"
);
MerchantConfig
merchantConfig
=
merchantService
.
findConfigByMerchantIdAndConfigName
(
4L
,
"returnUrl"
);
return
JsonResult
.
buildSuccessResult
(
""
,
ImmutableMap
.
of
(
"type"
,
"external"
,
"transition"
,
merchantConfig
.
getConfigValue
()));
return
JsonResult
.
buildSuccessResult
(
""
,
ImmutableMap
.
of
(
"type"
,
"external"
,
"transition"
,
merchantConfig
.
getConfigValue
()));
}
}
...
@@ -76,6 +80,9 @@ public class PlatformAPIController implements IBaseController {
...
@@ -76,6 +80,9 @@ public class PlatformAPIController implements IBaseController {
}
}
return
JsonResult
.
buildSuccessResult
(
""
,
ImmutableMap
.
of
(
"type"
,
"user"
,
"transition"
,
nextPage
));
return
JsonResult
.
buildSuccessResult
(
""
,
ImmutableMap
.
of
(
"type"
,
"user"
,
"transition"
,
nextPage
));
}
}
public
boolean
canPass
(
User
user
)
{
UserDetail
userDetail
=
userDetailService
.
findByUserId
(
user
.
getId
());
return
userDetail
!=
null
;
}
}
}
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