Merge remote-tracking branch 'origin/dev' into authority

src/main/java/com/uas/platform/b2b/event/PurchaseInquiryItemReplyReleaseEvent.java

@@ -4,6 +4,7 @@ import com.uas.platform.b2b.model.PagingRelease;
 import com.uas.platform.b2b.model.PagingReleaseDetail;
 import com.uas.platform.b2b.model.PurchaseInquiryItem;
 import com.uas.platform.core.model.Constant;
+import com.uas.platform.core.model.Status;
 
 import java.util.Date;
 import java.util.List;
@@ -45,7 +46,13 @@ public class PurchaseInquiryItemReplyReleaseEvent extends SaveReleaseEvent<Pagin
         String type = "回复询价单";
         String title = "B2B商务提醒";
         String enName = inquiryItem.getEnterprise().getEnName();
-        String context = enName + "的" + emName + "回复了询价单（" + codeValue + "）的报价，请及时确认！";
+        String context;
+        if (inquiryItem.getStatus() == Status.REPLIED.value()) {
+            context = enName + "的" + emName + "修改了询价单（" + codeValue + "）的报价，请及时确认！";
+        } else {
+
+            context = enName + "的" + emName + "回复了询价单（" + codeValue + "）的报价，请及时确认！";
+        }
         Short isReply = Constant.YES;
         String category = "purc";
         String table = "v$purc$inquiryitems";

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

@@ -404,6 +404,8 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 			throw new IllegalStatusException("该询价单已经报价，不允许再次报价");
 		if ((item.getInquiry().getCheck() != null && item.getInquiry().getCheck() == Constant.YES) || (item.getAgreed() != null))
 			throw new IllegalOperatorException("报价失败，客户系统已经提交了该询价单");
+		// 判断是回复报价还是修改报价
+		Short status = inquiryItem.getStatus();
 		inquiryItem.setStatus((short) Status.REPLIED.value());
 		inquiryItem.setBackStatus((short) Status.NOT_UPLOAD.value());
 		inquiryItem.setReplySendStatus((short) Status.NOT_UPLOAD.value());
@@ -421,6 +423,8 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 		// 产生消息
 		if ("B2B".equals(purchaseInquiryItem.getSourceApp())) { // b2b的询价单才产生消息，erp的询价单会在erp产生消息
 			List<PurchaseInquiryItem> inquiryItems = new ArrayList<>();
+			// 判断是回复报价还是修改报价
+			inquiryItem.setStatus(status);
 			inquiryItems.add(purchaseInquiryItem);
 			ContextUtils.publishEvent(new PurchaseInquiryItemReplyReleaseEvent(inquiryItems));
 		}