修改

parent 70f2515b
...@@ -60,7 +60,7 @@ public class PlatformAPIController implements IBaseController { ...@@ -60,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)&&canPass(user)){ if("xyqb".equals(key)){
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()));
} }
...@@ -80,9 +80,7 @@ public class PlatformAPIController implements IBaseController { ...@@ -80,9 +80,7 @@ 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;
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment