作废询价单修改

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

src/main/java/com/uas/platform/b2b/erp/controller/InquiryController.java

@@ -19,7 +19,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import javax.persistence.criteria.CriteriaBuilder;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.util.List;
@@ -125,7 +124,7 @@ public class InquiryController {
 	@ResponseBody
 	public void onReplyInvalid(@RequestParam("data") String data) throws UnsupportedEncodingException {
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
-		List<Inquiry> inquiries = FlexJsonUtils.fromJsonArray(jsonStr, CriteriaBuilder.In.class);
+		List<Inquiry> inquiries = FlexJsonUtils.fromJsonArray(jsonStr, Inquiry.class);
 		purchaseInquiryService.onReplyInvalid(inquiries);
 		logger.log("询价单", "作废询价单", inquiries.size());
 	}

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

@@ -386,16 +386,6 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 				newInquiryItems.addAll(purchaseInquiry.getInquiryItems());
 				// 触发消息事件
 				ContextUtils.publishEvent(new PurchaseInquiryItemInvalidReleaseEvent(PurchaseInquiryItem.distinct(newInquiryItems)));
-				// 将客户处理报价结果推送通知供应商联系人UU号
-				for (PurchaseInquiryItem item : purchaseInquiry.getInquiryItems()) {
-					PurchaseInquiry inquiry1 = item.getInquiry();
-					String tittle = (item.getAgreed() == Constant.YES) ? "客户同意了您的报价" : "客户不同意您的报价";
-					if (item.getVendUserUU() != null) {
-						UserBaseInfo user = userBaseInfoDao.findOne(item.getVendUserUU());
-						XingePusher.pushByUser(user, tittle,
-								"物料:" + item.getProduct().getTitle() + ",客户:" + inquiry1.getEnterprise().getEnName(), "", "");
-					}
-				}
 			}
 		}
 	}