Merge remote-tracking branch 'origin/dev' into feature-messagelog-shicr

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

@@ -427,6 +427,12 @@ public class PublicInquiryItemInfo implements Serializable {
 	@Column(name = "id_cust_currency")
 	private String custCurrency;
 
+	/**
+	 * 拒绝采纳理由
+	 */
+	@Column(name = "id_refusereason")
+	private String refusereason;
+
 	public User getUser() {
 		return user;
 	}
@@ -923,6 +929,18 @@ public class PublicInquiryItemInfo implements Serializable {
 		this.custCurrency = custCurrency;
 	}
 
+	public void setRemainingTime(Long remainingTime) {
+		this.remainingTime = remainingTime;
+	}
+
+	public String getRefusereason() {
+		return refusereason;
+	}
+
+	public void setRefusereason(String refusereason) {
+		this.refusereason = refusereason;
+	}
+
 	@Override
 	public String toString() {
 		return "PublicInquiryItemInfo{" +
@@ -982,6 +1000,13 @@ public class PublicInquiryItemInfo implements Serializable {
 				", unit='" + unit + '\'' +
 				", cmpCode='" + cmpCode + '\'' +
 				", inbrand='" + inbrand + '\'' +
+				", remainingTime=" + remainingTime +
+				", checked=" + checked +
+				", attachUrl='" + attachUrl + '\'' +
+				", attachName='" + attachName + '\'' +
+				", user=" + user +
+				", custCurrency='" + custCurrency + '\'' +
+				", refusereason='" + refusereason + '\'' +
 				'}';
 	}
 }

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

@@ -509,6 +509,8 @@ public class InquiryServiceImpl implements InquiryService {
     @Override
     public void decideQuote(Long id, Short status) {
         PublicInquiryItem item = itemDao.findOne(id);
+        // 验证是否重复操作
+        validateInquiry(item);
         item.setAgreed(status);
         itemDao.save(item);
         // 更新询价推荐表相关信息
@@ -535,6 +537,8 @@ public class InquiryServiceImpl implements InquiryService {
     @Override
     public void adpotQuote(Long id, Short status) {
         PublicInquiryItem item = itemDao.findOne(id);
+        // 验证是否重复操作
+        validateInquiry(item);
         item.setAgreed(status);
         itemDao.save(item);
         // 更新询价推荐表相关信息
@@ -551,6 +555,20 @@ public class InquiryServiceImpl implements InquiryService {
         inquiryService.adoptMessage(item, InquirySource.MALL.name());
     }
 
+    /**
+     * 验证是否已采纳或拒绝
+     * @param item 报价单
+     */
+    private void validateInquiry(PublicInquiryItem item) {
+        if (null != item.getAgreed()) {
+            if (item.getAgreed().equals(Constant.YES)) {
+                throw new IllegalOperatorException("该报价已被采纳，请勿重复处理");
+            } else if (item.getAgreed().equals(Constant.NO)) {
+                throw new IllegalOperatorException("该报价已被拒绝，请勿重复处理");
+            }
+        }
+    }
+
     /**
      * 商城通过报价明细id拒绝对供应商报价
      *
@@ -560,6 +578,8 @@ public class InquiryServiceImpl implements InquiryService {
     @Override
     public void refuseQuote(Long id, Short status,String refusereason) {
         PublicInquiryItem item = itemDao.findOne(id);
+        // 验证是否重复操作
+        validateInquiry(item);
         item.setAgreed(status);
         item.setRefusereason(refusereason);
         itemDao.save(item);