公共询价增加买家初始设置的物料的币别信息

src/main/java/com/uas/ps/inquiry/model/PublicInquiryItem.java

@@ -432,6 +432,12 @@ public class PublicInquiryItem implements Serializable {
 	@Transient
 	private String attachName;
 
+	/**
+	 * 买家发出公共询价单时录入的币别
+	 */
+	@Column(name = "id_cust_currency")
+	private String custCurrency;
+
 	public Long getId() {
 		return id;
 	}
@@ -930,6 +936,14 @@ public class PublicInquiryItem implements Serializable {
 		this.attachName = attachName;
 	}
 
+	public String getCustCurrency() {
+		return custCurrency;
+	}
+
+	public void setCustCurrency(String custCurrency) {
+		this.custCurrency = custCurrency;
+	}
+
 	/**
 	 * 将公共询价单转成报价单
 	 *

src/main/java/com/uas/ps/inquiry/model/PublicInquiryItemInfo.java

@@ -421,6 +421,11 @@ public class PublicInquiryItemInfo implements Serializable {
 	@JoinColumn(name = "id_venduseruu", insertable = false, updatable = false)
 	private User user;
 
+	/**
+	 * 买家发出公共询价单时录入的币别
+	 */
+	@Column(name = "id_cust_currency")
+	private String custCurrency;
 
 	public User getUser() {
 		return user;
@@ -910,7 +915,15 @@ public class PublicInquiryItemInfo implements Serializable {
         this.attachName = attachName;
     }
 
-    @Override
+	public String getCustCurrency() {
+		return custCurrency;
+	}
+
+	public void setCustCurrency(String custCurrency) {
+		this.custCurrency = custCurrency;
+	}
+
+	@Override
 	public String toString() {
 		return "PublicInquiryItemInfo{" +
 				"id=" + id +

src/main/java/com/uas/ps/inquiry/model/PurcInquiryItem.java

@@ -318,6 +318,12 @@ public class PurcInquiryItem {
 	@Transient
 	private Long remainingTime;
 
+	/**
+	 * 买家发出公共询价单时录入的币别
+	 */
+	@Column(name = "id_cust_currency")
+	private String custCurrency;
+
 	public Long getId() {
 		return id;
 	}
@@ -696,17 +702,20 @@ public class PurcInquiryItem {
         this.endDate = endDate;
     }
 
-    public static List<PurcInquiry> distinct(List<PurcInquiryItem> inquiryItems) {
-		List<PurcInquiry> inquiries = new ArrayList<>();
-		Set<Long> keys = new HashSet<>();
-		for (PurcInquiryItem item : inquiryItems) {
-			if (!keys.contains(item.getInquiry().getId())) {
-				inquiries.add(item.getInquiry());
-				keys.add(item.getInquiry().getId());
-			}
+	public String getCustCurrency() {
+		return custCurrency;
+	}
+
+	public void setCustCurrency(String custCurrency) {
+		this.custCurrency = custCurrency;
+	}
+
+	public Long getRemainingTime() {
+		if (endDate != null) {
+			return endDate.getTime() - System.currentTimeMillis();
 		}
-		return inquiries;
-    }
+		return null;
+	}
 
     @Override
     public String toString() {
@@ -761,10 +770,4 @@ public class PurcInquiryItem {
                 '}';
     }
 
-	public Long getRemainingTime() {
-		if (endDate != null) {
-			return endDate.getTime() - System.currentTimeMillis();
-		}
-		return null;
-	}
 }

src/main/java/com/uas/ps/inquiry/model/PurcInquiryItemInfo.java

@@ -343,6 +343,12 @@ public class PurcInquiryItemInfo {
 	@Transient
 	private List<PublicInquiryItem> qutations;
 
+	/**
+	 * 买家发出公共询价单时录入的币别
+	 */
+	@Column(name = "id_cust_currency")
+	private String custCurrency;
+
 	public Long getId() {
 		return id;
 	}
@@ -762,19 +768,15 @@ public class PurcInquiryItemInfo {
 		this.qutations = qutations;
 	}
 
-	public static List<PurcInquiryInfo> distinct(List<PurcInquiryItemInfo> inquiryItems) {
-		List<PurcInquiryInfo> inquiries = new ArrayList<>();
-		Set<Long> keys = new HashSet<>();
-		for (PurcInquiryItemInfo item : inquiryItems) {
-			if (!keys.contains(item.getInquiry().getId())) {
-				inquiries.add(item.getInquiry());
-				keys.add(item.getInquiry().getId());
-			}
-		}
-		return inquiries;
-    }
+	public String getCustCurrency() {
+		return custCurrency;
+	}
+
+	public void setCustCurrency(String custCurrency) {
+		this.custCurrency = custCurrency;
+	}
 
-    @Override
+	@Override
     public String toString() {
         return "PurcInquiryItemInfo{" +
                 "id=" + id +

src/main/java/com/uas/ps/inquiry/service/impl/PublicInquiryServiceImpl.java

@@ -473,8 +473,8 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                             } else {
                                 item.setDate(new Date(System.currentTimeMillis()));
                             }
-                            if (item.getCurrency() == null) {
-                                item.setCurrency("RMB");
+                            if (item.getCustCurrency() == null) {
+                                item.setCustCurrency("RMB");
                             }
                             purcInquiryItems.add(item);
                         }