| @@ -280,27 +280,27 @@ public class WxUserGrantController extends BaseController { | |||
| } | |||
| // 老用户,给出来已选中的mall | |||
| if (mallList != null) { | |||
| WxMall selectedMall = null; | |||
| if (StringUtils.isNotBlank(oldUser.getParentTenantId())) { | |||
| final String lastSubTenant = oldUser.getTenantId(); | |||
| List<WxMall> selMallList = mallList.stream().filter(ml -> ml.getTenantId().equalsIgnoreCase(lastSubTenant)).collect(Collectors.toList()); | |||
| if (selMallList.size() > 0) { | |||
| selectedMall = selMallList.get(0); | |||
| } | |||
| } | |||
| if (selectedMall == null){ | |||
| WxMall firstMall = mallList.get(0); | |||
| if (firstMall != null) { | |||
| selectedMall = firstMall; | |||
| } | |||
| } | |||
| if (selectedMall != null) { | |||
| request.setAttribute(Constant.TENANT_ID, selectedMall.getTenantId()); | |||
| resultMap.put("selectedMall", selectedMall.getTenantId()); | |||
| // oldUser.setParentTenantId(selectedMall.getParentTenantId()); | |||
| } | |||
| } | |||
| // if (mallList != null) { | |||
| // WxMall selectedMall = null; | |||
| // if (StringUtils.isNotBlank(oldUser.getParentTenantId())) { | |||
| // final String lastSubTenant = oldUser.getTenantId(); | |||
| // List<WxMall> selMallList = mallList.stream().filter(ml -> ml.getTenantId().equalsIgnoreCase(lastSubTenant)).collect(Collectors.toList()); | |||
| // if (selMallList.size() > 0) { | |||
| // selectedMall = selMallList.get(0); | |||
| // } | |||
| // } | |||
| // if (selectedMall == null){ | |||
| // WxMall firstMall = mallList.get(0); | |||
| // if (firstMall != null) { | |||
| // selectedMall = firstMall; | |||
| // } | |||
| // } | |||
| // if (selectedMall != null) { | |||
| // request.setAttribute(Constant.TENANT_ID, selectedMall.getTenantId()); | |||
| // resultMap.put("selectedMall", selectedMall.getTenantId()); | |||
| //// oldUser.setParentTenantId(selectedMall.getParentTenantId()); | |||
| // } | |||
| // } | |||
| oldUser.setRegisterIp(ipaddress); | |||
| oldUser.setSessionKey(session_key); | |||
| @@ -379,15 +379,15 @@ public class WxUserGrantController extends BaseController { | |||
| if(StringUtils.isNotBlank(newUser.getParentTenantId())){ | |||
| request.setAttribute(Constant.PARENT_TENANT_ID, newUser.getParentTenantId()); | |||
| } | |||
| if (mallList != null) { | |||
| WxMall firstMall = mallList.get(0); | |||
| if (firstMall != null) { | |||
| // 默认选中第一个mall, 或者经纬度最近的那个 | |||
| request.setAttribute(Constant.TENANT_ID, firstMall.getTenantId()); | |||
| resultMap.put("selectedMall", firstMall.getTenantId()); | |||
| newUser.setParentTenantId(firstMall.getTenantId()); | |||
| } | |||
| } | |||
| // if (mallList != null) { | |||
| // WxMall firstMall = mallList.get(0); | |||
| // if (firstMall != null) { | |||
| // // 默认选中第一个mall, 或者经纬度最近的那个 | |||
| // request.setAttribute(Constant.TENANT_ID, firstMall.getTenantId()); | |||
| // resultMap.put("selectedMall", firstMall.getTenantId()); | |||
| // newUser.setParentTenantId(firstMall.getTenantId()); | |||
| // } | |||
| // } | |||
| // 登录后处理 | |||
| int score = wxCUserService.actionAfterLogin(newUser, null); | |||