修改

parent f38a260c
...@@ -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;
}
} }
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