uas系统中根据客户UU+客户联系人手机号码获取客户联系人个人UU号

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@4761 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/controller/PublicQueryController.java

@@ -167,92 +167,36 @@ public class PublicQueryController {
 	}
 
 	/**
-	 * 按企业UU、个人UU去匹配查找用户密码，是否与ERP中设置的密码一致
+	 * 按企业UU、个人手机号码去匹配查找用户UU，能查询得到则返回，查询不到不返回
 	 * 
 	 * @return
 	 */
-	@RequestMapping(value = "/members/UserEnterprise", method = RequestMethod.GET)
+	@RequestMapping(value = "/userUUByTelAndEnUU", method = RequestMethod.GET)
 	@ResponseBody
 	@ResponseStatus(value = HttpStatus.OK)
-	public Map<String, Object> getUserEnterprise(String enName, String enBusinesscode, String emMobile, String emPassword, String emName)
-			throws UnsupportedEncodingException {
-		// ModelMap returnMap = new ModelMap();
+	public Map<String, Object> getUserUUByTelAndEnUU(String userTel, Long enUU) throws UnsupportedEncodingException {
 		Map<String, Object> infos = new HashMap<String, Object>();
 		boolean ok = false;
 		String error = null;
-		// 首先查找营业执照号与企业名称是否存在
-		if (!StringUtils.isEmpty(enName) && !StringUtils.isEmpty(enBusinesscode)) {
-			List<Enterprise> enterprises = enterpriseService.findByName(enName);
-			if (!CollectionUtils.isEmpty(enterprises)) {
-				for (Enterprise os : enterprises) {
-					if (os.getEnBussinessCode().equals(enBusinesscode)) {
-						List<User> users = userService.findUsersByEnUU(os.getUu());
-						for (User user : users) {
-							if (user.getUserTel() != null && user.getUserTel().equals(emMobile)) {
-								ok = true;
-								infos.put("enuu", os.getUu());
-								infos.put("emuu", user.getUserUU());
-								if (StringUtils.isEmpty(os.getAccessSecret())) {
-									String secret = StringUtil.uuid();
-									os.setAccessSecret(secret);
-									enterpriseDao.save(os);
-									infos.put("enSecret", os.getAccessSecret());
-								} else {
-									infos.put("enSecret", os.getAccessSecret());
-								}
-								break;
-							}
-						}
-						User user = null;
-						if (ok == false) {
-							user = new User();
-							user.setUserName(emName);// 管理员姓名
-							user.setUserTel(emMobile);
-							user.setEnable(Constant.YES);
-							user.addEnterprise(os);// 添加userenterpris对应关系
-							User newUser = userDao.save(user);
-							newUser.setUserPwd(Md5Utils.encode(emPassword, newUser.getUserUU()));
-							userDao.save(newUser);
-							if (os.getEnAdminuu() != null) {
-
-							} else {
-								os.setEnAdminuu(newUser.getUserUU());
-								os.setEnAdminPassword(emPassword);
-								os = enterpriseDao.save(os);// 再次保存enterprise
-								enterpriseDao.callInitProcedure(os.getUu());// 设置对照关系
-							}
-							ok = true;
-							infos.put("enuu", os.getUu());
-							infos.put("emuu", newUser.getUserUU());
-							if (StringUtils.isEmpty(os.getAccessSecret())) {
-								String secret = StringUtil.uuid();
-								os.setAccessSecret(secret);
-								enterpriseDao.save(os);
-								infos.put("enSecret", os.getAccessSecret());
-							} else {
-								infos.put("enSecret", os.getAccessSecret());
-							}
-						}
+		// 首先查找企业是否存在
+		if (!StringUtils.isEmpty(userTel) && enUU != null) {
+			List<User> users = userService.findUsersByEnUU(enUU);
+			if (!CollectionUtils.isEmpty(users)) {
+				for (User us : users) {
+					// 手机号码是否对应得上
+					if (us.getUserTel().equals(userTel)) {
+						ok = true;
+						infos.put("userUU", us.getUserUU());
+						infos.put("userImid", us.getUserIMId());
+						break;
 					}
 				}
-				if (ok == false) {
-					error = "企业名称与营业执照号不符!";
-				}
 			} else {
-				try {
-					Enterprise enterprise = enterpriseService.findByenBussinessCode(enBusinesscode);
-					if (enterprise != null) {
-						error = "企业名称与营业执照号不符!";
-						infos.put("enName", enterprise.getEnName());
-					} else {
-						error = "企业信息未注册,请先注册!";
-					}
-				} catch (Exception e) {
-					error = "企业信息未注册,请先注册!";
-				}
+				error = "手机号码不存在!";
 			}
-		} else {
-			error = "企业名称与企业营业执照号不能为空!";
+		}
+		if (error == null && !ok) {
+			error = "企业信息或者手机号码错误!";
 		}
 		infos.put("ok", ok);
 		infos.put("error", error);
@@ -411,4 +355,96 @@ public class PublicQueryController {
 		return new ResponseEntity<ModelMap>(data, HttpStatus.OK);
 	}
 
+	/**
+	 * 按企业UU、个人UU去匹配查找用户密码，是否与ERP中设置的密码一致
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "/members/UserEnterprise", method = RequestMethod.GET)
+	@ResponseBody
+	@ResponseStatus(value = HttpStatus.OK)
+	public Map<String, Object> getUserEnterprise(String enName, String enBusinesscode, String emMobile, String emPassword, String emName)
+			throws UnsupportedEncodingException {
+		// ModelMap returnMap = new ModelMap();
+		Map<String, Object> infos = new HashMap<String, Object>();
+		boolean ok = false;
+		String error = null;
+		// 首先查找营业执照号与企业名称是否存在
+		if (!StringUtils.isEmpty(enName) && !StringUtils.isEmpty(enBusinesscode)) {
+			List<Enterprise> enterprises = enterpriseService.findByName(enName);
+			if (!CollectionUtils.isEmpty(enterprises)) {
+				for (Enterprise os : enterprises) {
+					if (os.getEnBussinessCode().equals(enBusinesscode)) {
+						List<User> users = userService.findUsersByEnUU(os.getUu());
+						for (User user : users) {
+							if (user.getUserTel() != null && user.getUserTel().equals(emMobile)) {
+								ok = true;
+								infos.put("enuu", os.getUu());
+								infos.put("emuu", user.getUserUU());
+								if (StringUtils.isEmpty(os.getAccessSecret())) {
+									String secret = StringUtil.uuid();
+									os.setAccessSecret(secret);
+									enterpriseDao.save(os);
+									infos.put("enSecret", os.getAccessSecret());
+								} else {
+									infos.put("enSecret", os.getAccessSecret());
+								}
+								break;
+							}
+						}
+						User user = null;
+						if (ok == false) {
+							user = new User();
+							user.setUserName(emName);// 管理员姓名
+							user.setUserTel(emMobile);
+							user.setEnable(Constant.YES);
+							user.addEnterprise(os);// 添加userenterpris对应关系
+							User newUser = userDao.save(user);
+							newUser.setUserPwd(Md5Utils.encode(emPassword, newUser.getUserUU()));
+							userDao.save(newUser);
+							if (os.getEnAdminuu() != null) {
+
+							} else {
+								os.setEnAdminuu(newUser.getUserUU());
+								os.setEnAdminPassword(emPassword);
+								os = enterpriseDao.save(os);// 再次保存enterprise
+								enterpriseDao.callInitProcedure(os.getUu());// 设置对照关系
+							}
+							ok = true;
+							infos.put("enuu", os.getUu());
+							infos.put("emuu", newUser.getUserUU());
+							if (StringUtils.isEmpty(os.getAccessSecret())) {
+								String secret = StringUtil.uuid();
+								os.setAccessSecret(secret);
+								enterpriseDao.save(os);
+								infos.put("enSecret", os.getAccessSecret());
+							} else {
+								infos.put("enSecret", os.getAccessSecret());
+							}
+						}
+					}
+				}
+				if (ok == false) {
+					error = "企业名称与营业执照号不符!";
+				}
+			} else {
+				try {
+					Enterprise enterprise = enterpriseService.findByenBussinessCode(enBusinesscode);
+					if (enterprise != null) {
+						error = "企业名称与营业执照号不符!";
+						infos.put("enName", enterprise.getEnName());
+					} else {
+						error = "企业信息未注册,请先注册!";
+					}
+				} catch (Exception e) {
+					error = "企业信息未注册,请先注册!";
+				}
+			}
+		} else {
+			error = "企业名称与企业营业执照号不能为空!";
+		}
+		infos.put("ok", ok);
+		infos.put("error", error);
+		return infos;
+	}
 }