feat: 修改订单的用户对象为简易对象

src/main/java/com/uas/platform/b2b/manage/model/AccountInfo.java

@@ -1,139 +0,0 @@
-package com.uas.platform.b2b.manage.model;
-
-import com.uas.platform.b2b.model.Enterprise;
-import com.uas.platform.b2b.model.User;
-import com.uas.platform.b2b.model.UserBaseInfo;
-
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * 账户信息
- *
- * @author US50
- */
-public class AccountInfo {
-
-	/**
-	 * 企业UU号
-	 */
-	private Long enUU;
-
-	/**
-	 * 个人UU号
-	 */
-	private Long userUU;
-
-    /**
-     * 姓名
-     */
-	private String name;
-
-	/**
-	 * 手机号
-	 */
-	private String tel;
-	/**
-	 * 邮箱
-	 */
-	private String email;
-
-	/**
-	 * 密码（密文）
-	 */
-	private String password;
-
-    /**
-     * imID
-     */
-	private Long userIMId;
-
-	public Long getUserIMId() {
-		return userIMId;
-	}
-
-	public void setUserIMId(Long userIMId) {
-		this.userIMId = userIMId;
-	}
-
-	public void setEnUU(Long enUU) {
-		this.enUU = enUU;
-	}
-
-	public Long getEnUU() {
-		return enUU;
-	}
-
-	public Long getUserUU() {
-		return userUU;
-	}
-
-	public void setUserUU(Long userUU) {
-		this.userUU = userUU;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getTel() {
-		return tel;
-	}
-
-	public void setTel(String tel) {
-		this.tel = tel;
-	}
-
-	public String getEmail() {
-		return email;
-	}
-
-	public void setEmail(String email) {
-		this.email = email;
-	}
-
-	public String getPassword() {
-		return password;
-	}
-
-	public void setPassword(String password) {
-		this.password = password;
-	}
-
-	public AccountInfo() {
-	}
-
-	public AccountInfo(UserBaseInfo user, long enUU) {
-		this.email = user.getUserEmail();
-		this.enUU = enUU;
-		this.name = user.getUserName();
-		this.password = user.getUserPwd();
-		this.tel = user.getUserTel();
-		this.userUU = user.getUserUU();
-		this.userIMId = user.getUserIMId();
-	}
-
-	public User convert() {
-		User user = new User();
-		user.setUserUU(this.userUU);
-		user.setUserEmail(this.email);
-		user.setUserName(this.name);
-		user.setUserTel(this.tel);
-		user.setUserPwd(this.password);
-		user.setUserIMId(this.userIMId);
-		if (this.enUU != null) {
-			Enterprise enterprise = new Enterprise();
-			enterprise.setUu(this.enUU);
-			Set<Enterprise> enterprises = new HashSet<Enterprise>();
-			enterprises.add(enterprise);
-			user.setEnterprises(enterprises);
-			user.setEnterprise(enterprise);
-		}
-		return user;
-	}
-
-}

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

@@ -47,7 +47,7 @@ public class PurchaseOrderAll {
 	 */
 	@OneToOne(cascade = { CascadeType.REFRESH })
 	@JoinColumn(name = "pu_useruu", insertable = false, updatable = false)
-	private User user;
+	private UserBaseInfo user;
 
 	/**
 	 * 采购单所属采购员UU
@@ -370,11 +370,11 @@ public class PurchaseOrderAll {
 		this.enterprise = enterprise;
 	}
 
-	public User getUser() {
+	public UserBaseInfo getUser() {
 		return user;
 	}
 
-	public void setUser(User user) {
+	public void setUser(UserBaseInfo user) {
 		this.user = user;
 	}
 

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

@@ -41,12 +41,6 @@ public class UserBaseInfo implements Serializable {
 	@Column(name = "user_name")
 	private String userName;
 
-    /**
-     * 密码
-     */
-	@Column(name = "user_pwd")
-	private String userPwd;
-
     /**
      * 邮箱
      */
@@ -99,14 +93,6 @@ public class UserBaseInfo implements Serializable {
 		this.userName = userName;
 	}
 
-	public String getUserPwd() {
-		return userPwd;
-	}
-
-	public void setUserPwd(String userPwd) {
-		this.userPwd = userPwd;
-	}
-
 	public String getUserEmail() {
 		return userEmail;
 	}
@@ -154,4 +140,19 @@ public class UserBaseInfo implements Serializable {
     public void setTransfer(boolean transfer) {
         this.transfer = transfer;
     }
+
+    public UserBaseInfo() {
+
+	}
+
+	public UserBaseInfo(User user) {
+		this.distribute = user.getDistribute();
+		this.transfer = user.getTransfer();
+		this.userEmail = user.getUserEmail();
+		this.userIMId = user.getUserIMId();
+		this.userName = user.getUserName();
+		this.userSex = user.getUserSex();
+		this.userTel = user.getUserTel();
+		this.userUU = user.getUserUU();
+	}
 }

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

@@ -531,8 +531,9 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 		order.setRecorder(SystemSession.getUser().getUserName());
 		order.setUserUU(SystemSession.getUser().getUserUU());
 		order.setEnterprise(enter);
-		order.setUser(SystemSession.getUser());
-		if (userBaseInfo != null) {// 如果供应商联系人存在uu号，录入该uu号；如果不存在，录入企业管理员uu
+		order.setUser(new UserBaseInfo(SystemSession.getUser()));
+		// 如果供应商联系人存在uu号，录入该uu号；如果不存在，录入企业管理员uu
+		if (userBaseInfo != null) {
 			order.setVendUserUU(userBaseInfo.getUserUU());
 		} else {
 			order.setVendUserUU(neworder.getVendUserUU());