更改采购预测传输实现

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

src/main/java/com/uas/platform/b2b/service/PurchaseForecastOrderService.java

@@ -2,15 +2,28 @@ package com.uas.platform.b2b.service;
 
 import java.util.List;
 
-import com.uas.platform.b2b.model.PurchaseForecastAll;
+import com.uas.platform.b2b.model.PurchaseForecastAllItem;
 
 
 public interface PurchaseForecastOrderService {
 
-	void save(List<PurchaseForecastAll> list);
-
-	public List<PurchaseForecastAll> findNotUploadOrder();
-
-	void onEndDownSuccess(String[] idArray);
+	/**
+	 * 根据采购预测的明细记录保存
+	 * @param items
+	 * @return
+	 */
+	public List<PurchaseForecastAllItem> save(List<PurchaseForecastAllItem> items);
+
+	/**
+	 * 获取没有上传到卖方ERP的客户采购预测
+	 * @return
+	 */
+	public List<PurchaseForecastAllItem> findNotUploadOrder();
+
+	/***
+	 * 上传到卖方ERP成功之后修改平台上的单据传输状态
+	 * @param idArray
+	 */
+	public void onEndDownSuccess(String[] idArray);
 
 }

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

@@ -1,42 +1,60 @@
 package com.uas.platform.b2b.service.impl;
 
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.uas.platform.b2b.dao.PurchaseForecastAllDao;
-import com.uas.platform.b2b.model.PurchaseForecastAll;
+import com.uas.platform.b2b.dao.PurchaseForecastAllItemDao;
+import com.uas.platform.b2b.model.PurchaseForecastAllItem;
 import com.uas.platform.b2b.service.PurchaseForecastOrderService;
 import com.uas.platform.b2b.support.SystemSession;
+import com.uas.platform.b2b.support.XingePusher;
 import com.uas.platform.core.model.Status;
-
 @Service
 public class PurchaseForecastOrderServiceImpl implements PurchaseForecastOrderService {
 
+	@Autowired
+	private PurchaseForecastAllItemDao purchaseForecastAllItemDao;
+	
 	@Autowired
 	private PurchaseForecastAllDao purchaseForecastAllDao;
-
+	
 	@Override
-	public void save(List<PurchaseForecastAll> convertPurchase) {
-		purchaseForecastAllDao.save(convertPurchase);
+	public List<PurchaseForecastAllItem> save(List<PurchaseForecastAllItem> items) {
+		List<PurchaseForecastAllItem> items2 = purchaseForecastAllItemDao.save(items);
+		Set<Long> vendUsers = new HashSet<Long>();
+		for(PurchaseForecastAllItem item : items2) {
+			//每一个相关的供应商联系人每次只接收到一条推送通知
+			if(! vendUsers.contains(item.getVendUserUU())) {
+				if(item.getVendUserUU() != null) {
+					XingePusher.pushSingleAccountAndroid(item.getVendUserUU().toString(), 
+							"客户对您下达了新的采购预测", "", null);
+					XingePusher.pushSingleAccountIOS(item.getVendUserUU().toString(), 
+							"客户对您下达了新的采购预测");
+				}
+				vendUsers.add(item.getVendUserUU());
+			}
+		}
+		return items2;
 	}
 
 	@Override
-	public List<PurchaseForecastAll> findNotUploadOrder() {
-		return purchaseForecastAllDao.findByVendUUAndSendStatus(SystemSession.getUser().getEnterprise().getUu(),
+	public List<PurchaseForecastAllItem> findNotUploadOrder() {
+		return purchaseForecastAllItemDao.findByVendUUAndSendStatus(SystemSession.getUser().getEnterprise().getUu(),
 				(short) Status.NOT_UPLOAD.value());
 	}
 
 	@Override
 	public void onEndDownSuccess(String[] idArray) {
 		for (String id : idArray) {
-			PurchaseForecastAll orderItem = purchaseForecastAllDao.findOne(Long.parseLong(id));
-			if (orderItem != null) {
-				orderItem.setSendStatus((short) Status.DOWNLOADED.value());
-				purchaseForecastAllDao.save(orderItem);
-				// 明细结案情况下，明细状态为已回复（即不再处理），时同时修改主记录状态
-				// updateOrderStatus(orderItem.getOrder().getId());
+			PurchaseForecastAllItem forecastAllItem = purchaseForecastAllItemDao.findOne(Long.parseLong(id));
+			if (forecastAllItem != null) {
+				forecastAllItem.setSendStatus((short) Status.DOWNLOADED.value());
+				purchaseForecastAllItemDao.save(forecastAllItem);
 			}
 		}
 	}