完善注册流程记录

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

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

@@ -128,11 +128,11 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 		model.put("checkcode", encodeString);
 		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);
+			registeRecord(enterprise, "主动申请发送激活邮件", "成功");
 		} catch(Exception e) {
 			registeRecord(enterprise, "主动申请发送激活邮件", "失败");
 		}
@@ -222,7 +222,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 			if (enterprise.getEnStatus() == Status.AUDITED.value()) {// 审核通过
 				String encodeString = tokenService.getEncodeToken("enterprise", enter.getUu());
 				User admin = userDao.findOne(enter.getEnAdminuu());
-				registeRecord(enter, "审核", "通过");
+				registeRecord(enter, "审核通过", "成功");
 				enter.setEnStatus((short) Status.UNACT.value());
 				enterpriseDao.save(enter);
 				if (admin != null) {
@@ -256,12 +256,13 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 					model.put("reason", enterprise.getEnAuditRemark());
 					try {
 						sendMailService.sendTemplateMail(admin.getUserEmail(), "很遗憾账号未能通过审核", model, "velocity/invalid.vm");
-						registeRecord(enterprise, "发送审核不通过邮件", "成功");
+						registeRecord(enter, "发送审核不通过邮件", "成功");
 					} catch (Exception e) {
-						registeRecord(enterprise, "发送审核不通过邮件", "失败");
+						registeRecord(enter, "发送审核不通过邮件", "失败");
 					}
 				}
-				enterpriseDao.delete(enterprise);// 删除企业记录
+				enterpriseDao.delete(enter);// 删除企业记录
+				registeRecord(enter, "审核不通过", "成功");
 			}
 		}
 	}
@@ -287,6 +288,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 		record.setEnUu(enterprise.getUu());
 		record.setRemark(remark);
 		record.setResult(result);
+		record.setSendStatus((short) Status.NOT_UPLOAD.value());
 		registerRecordDao.save(record);
 	}