企业激活中断处理

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

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

@@ -90,7 +90,7 @@ public class RegisterController {
 		ModelMap map = new ModelMap();
 		String checkReslt = enterpriseService.activateCheck(uu, checkcode);
 		map.put("result", checkReslt);
-		if (checkReslt.equals("SUCCESS")) {// 验证通过
+		if (checkReslt.equals("SUCCESS") || checkReslt.equals("SETPWD")) {// 验证通过
 			return new ResponseEntity<ModelMap>(map, headers, HttpStatus.OK);
 		} else {// 验证不通过
 			return new ResponseEntity<ModelMap>(map, headers, HttpStatus.EXPECTATION_FAILED);

src/main/java/com/uas/platform/b2b/service/impl/EnterpriseServiceImpl.java

@@ -101,7 +101,12 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 					return "验证码错误，激活失败";
 				}
 			} else {
-				return "企业账号已激活，操作失败";
+				User admin = userDao.findOne(enterprise.getEnAdminuu());
+				if(admin.getUserPwd() == null) {
+					return "SETPWD";
+				} else {
+					return "企业账号已激活并已设置管理员密码，您可以使用您的个人账号登陆UAS商务平台。";
+				}
 			}
 		}
 		return "找不到uu号对应的企业账号";
@@ -124,6 +129,10 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 		try{
 			sendMailService.sendTemplateMail(admin.getUserEmail(), "欢迎注册优软管理平台账号", model, "velocity/registerActivate.vm");
 			registeRecord(enterprise, "主动申请发送激活邮件", "成功");
+			enterprise.setEnable(Constant.NO);
+			admin.setEnable(Constant.NO);
+			enterpriseDao.save(enterprise);
+			userDao.save(admin);
 		} catch(Exception e) {
 			registeRecord(enterprise, "主动申请发送激活邮件", "失败");
 		}