Просмотр исходного кода

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

administrator 11 лет назад
Родитель
Сommit
cbf2efce0d

+ 15 - 9
src/main/java/com/uas/platform/b2b/service/impl/PurchaseInquiryServiceImpl.java

@@ -83,7 +83,7 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 		// 将客户处理报价结果推送通知供应商联系人UU号
 		for (PurchaseInquiryItem item : inquiryItems) {
 			PurchaseInquiry inquiry = item.getInquiry();
-			String tittle = (item.getAgreed() == Constant.YES) ? "客户同意了您的报价":"客户不同意您的报价";
+			String tittle = (item.getAgreed() == Constant.YES) ? "客户同意了您的报价" : "客户不同意您的报价";
 			if (item.getVendUserUU() != null) {
 				// Android
 				XingePusher.pushSingleAccountAndroid(item.getVendUserUU().toString(), tittle, "物料:" + item.getProduct().getTitle() + ",客户:"
@@ -206,14 +206,20 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 		inquiryItem.setStatus((short) Status.REPLIED.value());
 		inquiryItem.setBackStatus((short) Status.NOT_UPLOAD.value());
 		inquiryItem.setReplySendStatus((short) Status.NOT_UPLOAD.value());
-		//消息推送给询价单的录入人UU
-		if (item.getInquiry().getRecorderUU() != null && item.getInquiry().getRecorderUU() != 0) {
-			// Android
-			XingePusher.pushSingleAccountAndroid(item.getInquiry().getRecorderUU().toString(), "询价单回复", "单号:" + item.getInquiry().getCode() + ",第"
-					+ item.getNumber() + "行", "");
-			// IOS
-			XingePusher.pushSingleAccountIOS(inquiryItem.getInquiry().getRecorderUU().toString(), "询价单回复" + "单号:" + item.getInquiry().getCode() + ",第"
-					+ item.getNumber() + "行");
+		Long userUU = inquiryItem.getUserUU();
+		if (userUU == null) {
+			userUU = item.getInquiry().getRecorderUU();
+		}
+		if (userUU != null) {
+			// 消息推送
+			if (userUU != null && userUU != 0) {
+				// Android
+				XingePusher.pushSingleAccountAndroid(userUU.toString(), "询价单回复",
+						"单号:" + item.getInquiry().getCode() + ",第" + item.getNumber() + "行", "");
+				// IOS
+				XingePusher.pushSingleAccountIOS(userUU.toString(), "询价单回复" + "单号:" + item.getInquiry().getCode() + ",第" + item.getNumber()
+						+ "行");
+			}
 		}
 		purchaseInquiryItemDao.save(inquiryItem);
 	}