将管理员名字保存到管理平台

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

src/main/java/com/uas/platform/b2b/manage/controller/EnterpriseController.java

@@ -45,6 +45,7 @@ public class EnterpriseController {
 	 * 管理平台项目地址
 	 */
 	public static final String MANAGE_HOST = "http://218.17.158.219:9090/platform-manage/";
+//	public static final String MANAGE_HOST = "http://localhost:9090/platform-manage/";
 	
 	/**
 	 *管理平台获取需要审核的企业

src/main/java/com/uas/platform/b2b/model/Enterprise.java

@@ -142,7 +142,7 @@ public class Enterprise implements Serializable {
 	private Date enDate;
 
 	/**
-	 * 管理员
+	 * 管理员UU号
 	 */
 	@Column(name = "en_adminuu")
 	private Long enAdminuu;
@@ -178,22 +178,22 @@ public class Enterprise implements Serializable {
 	private String enAdminPassword;
 
 	@Transient
-	private User admin;
-
+	private User admin;// 管理员（前台页面显示）
+	
 	@Transient
-	private Long enBussinesscodeImg;
+	private Long enBussinesscodeImg;// 营业执照号附件id（转化传到管理平台）
 	
 	@Transient
-	private String enAdminName;
+	private String enAdminName;// 管理员名字(转化传到管理平台)
 
 	@Transient
-	private String enAdminTel;
+	private String enAdminTel;// 管理员手机号(转化传到管理平台)
 
 	@Transient
-	private String enAdminEmail;
+	private String enAdminEmail;// 管理员邮箱(转化传到管理平台)
 	
 	@Transient
-	private String enAuditRemark;
+	private String enAuditRemark;// 审核(从管理平台传过来)
 
 	@JSONField(serialize = false)
 	@JsonIgnore
@@ -335,14 +335,6 @@ public class Enterprise implements Serializable {
 		this.enDate = enDate;
 	}
 
-	public User getAdmin() {
-		return admin;
-	}
-
-	public void setAdmin(User admin) {
-		this.admin = admin;
-	}
-
 	public Short getEnable() {
 		return enable;
 	}
@@ -407,6 +399,14 @@ public class Enterprise implements Serializable {
 		this.enArea = enArea;
 	}
 
+	public User getAdmin() {
+		return admin;
+	}
+
+	public void setAdmin(User admin) {
+		this.admin = admin;
+	}
+
 	public String getEnAdminName() {
 		return enAdminName;
 	}

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

@@ -187,7 +187,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 		userDao.save(admin);
 		enterprise.setEnAdminPassword(password);
 		enterpriseDao.save(enterprise);
-		updateManagePassword(enuu, password);
+		updateManagePassword(enuu, password);// 同步管理平台和老平台的用户密码
 		registeRecord(enterprise, "设置管理员密码", "成功");
 		if(enterprise.getEnSaasStatus() != null && enterprise.getEnSaasStatus() == Status.ENABLED.value() && 
 				enterprise.getEnSaasUrl() != null) {
@@ -230,6 +230,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 				if (adminUser != null) {
 					enterprise.setEnAdminEmail(adminUser.getUserEmail());
 					enterprise.setEnAdminTel(adminUser.getUserTel());
+					enterprise.setEnAdminName(adminUser.getUserName());
 				}
 				if(enterprise.getEnBussinessCodeAttach() != null) {
 					enterprise.setEnBussinesscodeImg(enterprise.getEnBussinessCodeAttach().getId());