master
gaojie 2019-03-01 10:36:19 +08:00
parent 839abf13b5
commit 599b18f201
4 changed files with 27 additions and 6 deletions

View File

@ -47,7 +47,11 @@ public class SendMailController {
ResultVo resultVo = new ResultVo("1006", "serialNo is exist"); ResultVo resultVo = new ResultVo("1006", "serialNo is exist");
return JsonUtil.getInstence().getGson().toJson(resultVo); 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()){ if (Integer.parseInt(roleId) != cUserInfo.getUserId()){
ResultVo resultVo = new ResultVo("1038", "no userInfo"); ResultVo resultVo = new ResultVo("1038", "no userInfo");
return JsonUtil.getInstence().getGson().toJson(resultVo); return JsonUtil.getInstence().getGson().toJson(resultVo);

View File

@ -32,15 +32,20 @@ public class UserController {
FindPlayerResult findPlayerResult = new FindPlayerResult("1010","sign derify failed",null); FindPlayerResult findPlayerResult = new FindPlayerResult("1010","sign derify failed",null);
return JsonUtil.getInstence().getGson().toJson(findPlayerResult); return JsonUtil.getInstence().getGson().toJson(findPlayerResult);
} }
CUserInfo cUserInfo = cuserDao.getUserInfobyNameAndServerId(userId, Integer.parseInt(serverCode)); List<CUserInfo> cUserInfoList = cuserDao.getUserInfo(userId, Integer.parseInt(serverCode));
if (null == cUserInfo){ if (null == cUserInfoList || cUserInfoList.size() == 0){
LOGGER.info("UserController=>userName={},serverId={},cUserInfo is null",userId,serverCode); LOGGER.info("UserController=>userName={},serverId={},cUserInfo is null",userId,serverCode);
FindPlayerResult findPlayerResult = new FindPlayerResult("1038","no userInfo",null); FindPlayerResult findPlayerResult = new FindPlayerResult("1038","no userInfo",null);
return JsonUtil.getInstence().getGson().toJson(findPlayerResult); return JsonUtil.getInstence().getGson().toJson(findPlayerResult);
}else { }else {
List<PlayerInfo> playerInfos = new ArrayList<>(); List<PlayerInfo> playerInfos = new ArrayList<>();
for (CUserInfo cUserInfo:cUserInfoList){
CUser cUser = cuserDao.getCUser(cUserInfo.getUserId(), cUserInfo.getServerid()); 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)); playerInfos.add(new PlayerInfo(URLEncoder.encode(cUser.getUserName(), "utf-8"),cUser.getLevel(),String.valueOf(cUser.getId()),serverCode));
}
FindPlayerResult findPlayerResult = new FindPlayerResult("1000","success",playerInfos); FindPlayerResult findPlayerResult = new FindPlayerResult("1000","success",playerInfos);
return JsonUtil.getInstence().getGson().toJson(findPlayerResult); return JsonUtil.getInstence().getGson().toJson(findPlayerResult);
} }

View File

@ -20,4 +20,5 @@ public interface CUserDao {
boolean getMailSeriaNo(String serialNo); boolean getMailSeriaNo(String serialNo);
List<CUserInfo> getUserInfo(String userId, int serverId) throws Exception;
} }

View File

@ -85,6 +85,17 @@ public class CUserDaoImpl implements CUserDao {
return true; return true;
} }
@Override
public List<CUserInfo> 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<CUserInfo> cUserInfoList = mongoTemplate.find(query,CUserInfo.class);
return cUserInfoList;
}
@Override @Override
public List<CPayOrder> getOrderInfoBydate(String agoDate) { public List<CPayOrder> getOrderInfoBydate(String agoDate) {
List<CPayOrder> orderInfoBydate = new ArrayList<>(); List<CPayOrder> orderInfoBydate = new ArrayList<>();