diff --git a/src/main/java/com/jmfy/controller/SendMailController.java b/src/main/java/com/jmfy/controller/SendMailController.java index 538a0a4..b212708 100644 --- a/src/main/java/com/jmfy/controller/SendMailController.java +++ b/src/main/java/com/jmfy/controller/SendMailController.java @@ -47,7 +47,11 @@ public class SendMailController { ResultVo resultVo = new ResultVo("1006", "serialNo is exist"); return JsonUtil.getInstence().getGson().toJson(resultVo); } - CUserInfo cUserInfo = cuserDao.getUserInfobyNameAndServerId(userId, Integer.parseInt(serverCode)); + String plat = "android"; + if (gameCode.equals(YsjConstant.TW_IOS_GameCode)){ + plat = "ios"; + } + CUserInfo cUserInfo = cuserDao.getUserInfobyNameAndServerId(userId, Integer.parseInt(serverCode),plat); if (Integer.parseInt(roleId) != cUserInfo.getUserId()){ ResultVo resultVo = new ResultVo("1038", "no userInfo"); return JsonUtil.getInstence().getGson().toJson(resultVo); diff --git a/src/main/java/com/jmfy/controller/UserController.java b/src/main/java/com/jmfy/controller/UserController.java index 55bbf42..988e265 100644 --- a/src/main/java/com/jmfy/controller/UserController.java +++ b/src/main/java/com/jmfy/controller/UserController.java @@ -32,15 +32,20 @@ public class UserController { FindPlayerResult findPlayerResult = new FindPlayerResult("1010","sign derify failed",null); return JsonUtil.getInstence().getGson().toJson(findPlayerResult); } - CUserInfo cUserInfo = cuserDao.getUserInfobyNameAndServerId(userId, Integer.parseInt(serverCode)); - if (null == cUserInfo){ + List cUserInfoList = cuserDao.getUserInfo(userId, Integer.parseInt(serverCode)); + if (null == cUserInfoList || cUserInfoList.size() == 0){ LOGGER.info("UserController=>userName={},serverId={},cUserInfo is null",userId,serverCode); FindPlayerResult findPlayerResult = new FindPlayerResult("1038","no userInfo",null); return JsonUtil.getInstence().getGson().toJson(findPlayerResult); }else { List playerInfos = new ArrayList<>(); - CUser cUser = cuserDao.getCUser(cUserInfo.getUserId(), cUserInfo.getServerid()); - playerInfos.add(new PlayerInfo(URLEncoder.encode(cUser.getUserName(), "utf-8"),cUser.getLevel(),String.valueOf(cUser.getId()),serverCode)); + for (CUserInfo cUserInfo:cUserInfoList){ + CUser cUser = cuserDao.getCUser(cUserInfo.getUserId(), cUserInfo.getServerid()); + if (cUser == null){ + continue; + } + playerInfos.add(new PlayerInfo(URLEncoder.encode(cUser.getUserName(), "utf-8"),cUser.getLevel(),String.valueOf(cUser.getId()),serverCode)); + } FindPlayerResult findPlayerResult = new FindPlayerResult("1000","success",playerInfos); return JsonUtil.getInstence().getGson().toJson(findPlayerResult); } diff --git a/src/main/java/com/jmfy/dto/CUserDao.java b/src/main/java/com/jmfy/dto/CUserDao.java index 566dfbd..28c2546 100644 --- a/src/main/java/com/jmfy/dto/CUserDao.java +++ b/src/main/java/com/jmfy/dto/CUserDao.java @@ -20,4 +20,5 @@ public interface CUserDao { boolean getMailSeriaNo(String serialNo); + List getUserInfo(String userId, int serverId) throws Exception; } diff --git a/src/main/java/com/jmfy/dto/impl/CUserDaoImpl.java b/src/main/java/com/jmfy/dto/impl/CUserDaoImpl.java index 8e1b343..0ee822b 100644 --- a/src/main/java/com/jmfy/dto/impl/CUserDaoImpl.java +++ b/src/main/java/com/jmfy/dto/impl/CUserDaoImpl.java @@ -34,7 +34,7 @@ public class CUserDaoImpl implements CUserDao { } @Override - public CUserInfo getUserInfobyNameAndServerId(String name, int serverId,String plat) throws Exception { + public CUserInfo getUserInfobyNameAndServerId(String name, int serverId,String plat) throws Exception { Query query = new Query(); Criteria cr = new Criteria(); MongoTemplate mongoTemplate = connect.getMongoTemplete("ysj_core"); @@ -85,6 +85,17 @@ public class CUserDaoImpl implements CUserDao { return true; } + @Override + public List getUserInfo(String userId, int serverId) throws Exception { + Query query = new Query(); + Criteria cr = new Criteria(); + MongoTemplate mongoTemplate = connect.getMongoTemplete("ysj_core"); + cr.andOperator(Criteria.where("serverid").is(serverId), Criteria.where("openId").is(userId)); + query.addCriteria(cr); + List cUserInfoList = mongoTemplate.find(query,CUserInfo.class); + return cUserInfoList; + } + @Override public List getOrderInfoBydate(String agoDate) { List orderInfoBydate = new ArrayList<>();