Commit d5805b1b authored by Java-刘 彧阳's avatar Java-刘 彧阳

用户白条渠道验证

parent 390e6e96
...@@ -2,11 +2,13 @@ package cn.quantgroup.xyqb.controller.internal.login; ...@@ -2,11 +2,13 @@ package cn.quantgroup.xyqb.controller.internal.login;
import cn.quantgroup.xyqb.controller.IBaseController; import cn.quantgroup.xyqb.controller.IBaseController;
import cn.quantgroup.xyqb.entity.User; import cn.quantgroup.xyqb.entity.User;
import cn.quantgroup.xyqb.entity.UserBtRegister;
import cn.quantgroup.xyqb.model.JsonResult; import cn.quantgroup.xyqb.model.JsonResult;
import cn.quantgroup.xyqb.model.UserRet; import cn.quantgroup.xyqb.model.UserRet;
import cn.quantgroup.xyqb.model.session.LoginInfo; import cn.quantgroup.xyqb.model.session.LoginInfo;
import cn.quantgroup.xyqb.model.session.SessionStruct; import cn.quantgroup.xyqb.model.session.SessionStruct;
import cn.quantgroup.xyqb.service.http.IHttpService; import cn.quantgroup.xyqb.service.http.IHttpService;
import cn.quantgroup.xyqb.service.user.IUserBtRegisterService;
import cn.quantgroup.xyqb.service.user.IUserService; import cn.quantgroup.xyqb.service.user.IUserService;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
...@@ -42,6 +44,9 @@ public class AuthInfoController implements IBaseController { ...@@ -42,6 +44,9 @@ public class AuthInfoController implements IBaseController {
@Autowired @Autowired
private IUserService userService; private IUserService userService;
@Autowired
private IUserBtRegisterService userBtRegisterService;
@RequestMapping("/info/login") @RequestMapping("/info/login")
public JsonResult loginInfo() { public JsonResult loginInfo() {
...@@ -84,7 +89,13 @@ public class AuthInfoController implements IBaseController { ...@@ -84,7 +89,13 @@ public class AuthInfoController implements IBaseController {
context.setCreatedFrom(user.getRegisteredFrom()); context.setCreatedFrom(user.getRegisteredFrom());
context.setAppChannel(""); context.setAppChannel("");
if(user.getRegisteredFrom() == 222L) { if(user.getRegisteredFrom() == 222L) {
context.setBtMerchantId(1L); //context.setBtMerchantId(1L);
UserBtRegister userBtRegister = userBtRegisterService.findByUserId(user.getId());
if(null != userBtRegister){
context.setBtMerchantId(userBtRegister.getRegisterBtMerchantId());
}else {
context.setBtMerchantId(1L);
}
} }
loginInfo.setLoginContext(context); loginInfo.setLoginContext(context);
return JsonResult.buildSuccessResult("", loginInfo); return JsonResult.buildSuccessResult("", loginInfo);
......
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