消息事件报错修改。

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

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

@@ -1,11 +1,8 @@
 package com.uas.platform.b2b.event;
 
-import com.uas.platform.b2b.dao.UserDao;
 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.b2b.model.User;
-import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.Date;
 import java.util.List;
@@ -18,9 +15,6 @@ import java.util.List;
  */
 public class PurchaseInquiryItemDecideReleaseEvent extends SaveReleaseEvent<PagingReleaseDetail, PurchaseInquiryItem> {
 
-    @Autowired
-    private UserDao userDao;
-
     public PurchaseInquiryItemDecideReleaseEvent(List<PurchaseInquiryItem> savedList) {
         super(savedList);
     }
@@ -35,6 +29,9 @@ public class PurchaseInquiryItemDecideReleaseEvent extends SaveReleaseEvent<Pagi
     public PagingReleaseDetail release(PurchaseInquiryItem inquiryItem) {
         //TODO erp采纳或未采纳询价单之后，触发新增消息事件。
         Long emUU = inquiryItem.getUserUU();
+        if (null == emUU) {
+            emUU = 1L;
+        }
         String emName = inquiryItem.getInquiry().getRecorder();
         Long enUU = inquiryItem.getInquiry().getEnUU();
         Date date = new Date();
@@ -55,9 +52,8 @@ public class PurchaseInquiryItemDecideReleaseEvent extends SaveReleaseEvent<Pagi
         Long vendUU = inquiryItem.getVendUU();
         Long vendUserUU = inquiryItem.getVendUserUU();
         String vendUserName = "操作员";
-        if (null != vendUserUU) {
-            User vendUser = userDao.findOne(vendUserUU);
-            vendUserName = vendUser.getUserName();
+        if (null == vendUserUU) {
+            vendUserUU = 1L;
         }
         PagingReleaseDetail releaseDetail = new PagingReleaseDetail(vendUU, vendUserUU, vendUserName);
         releaseDetail.setPagingRelease(release);

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

@@ -1,11 +1,8 @@
 package com.uas.platform.b2b.event;
 
-import com.uas.platform.b2b.dao.UserDao;
 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.b2b.model.User;
-import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.Date;
 import java.util.List;
@@ -18,9 +15,6 @@ import java.util.List;
  */
 public class PurchaseInquiryItemInvalidReleaseEvent extends SaveReleaseEvent<PagingReleaseDetail, PurchaseInquiryItem> {
 
-    @Autowired
-    private UserDao userDao;
-
     public PurchaseInquiryItemInvalidReleaseEvent(List<PurchaseInquiryItem> savedList) {
         super(savedList);
     }
@@ -35,6 +29,9 @@ public class PurchaseInquiryItemInvalidReleaseEvent extends SaveReleaseEvent<Pag
     public PagingReleaseDetail release(PurchaseInquiryItem inquiryItem) {
         //TODO erp作废询价单之后，触发新增消息事件。
         Long emUU = inquiryItem.getUserUU();
+        if (null == emUU) {
+            emUU = 1L;
+        }
         String emName = inquiryItem.getInquiry().getRecorder();
         Long enUU = inquiryItem.getInquiry().getEnUU();
         Date date = new Date();
@@ -50,9 +47,8 @@ public class PurchaseInquiryItemInvalidReleaseEvent extends SaveReleaseEvent<Pag
         Long vendUU = inquiryItem.getVendUU();
         Long vendUserUU = inquiryItem.getVendUserUU();
         String vendUserName = "操作员";
-        if (null != vendUserUU) {
-            User vendUser = userDao.findOne(vendUserUU);
-            vendUserName = vendUser.getUserName();
+        if (null == vendUserUU) {
+           vendUserUU = 1L;
         }
         PagingReleaseDetail releaseDetail = new PagingReleaseDetail(vendUU, vendUserUU, vendUserName);
         releaseDetail.setPagingRelease(release);

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

@@ -1,11 +1,8 @@
 package com.uas.platform.b2b.event;
 
-import com.uas.platform.b2b.dao.UserDao;
 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.b2b.model.User;
-import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.Date;
 import java.util.List;
@@ -16,9 +13,6 @@ import java.util.List;
  */
 public class PurchaseInquiryItemReplyReleaseEvent extends SaveReleaseEvent<PagingReleaseDetail, PurchaseInquiryItem> {
 
-    @Autowired
-    private UserDao userDao;
-
 
     public PurchaseInquiryItemReplyReleaseEvent(List<PurchaseInquiryItem> savedList) {
         super(savedList);
@@ -35,9 +29,8 @@ public class PurchaseInquiryItemReplyReleaseEvent extends SaveReleaseEvent<Pagin
         // 回复订单的话，跟新增订单是相反的，所以接收人是user，发出人是vendUser
         Long emUU = inquiryItem.getVendUserUU();
         String emName = "操作员";
-        if (null != emUU) {
-            User vendUser = userDao.findOne(emUU);
-            emName = vendUser.getUserName();
+        if (null == emUU) {
+            emUU = 1L;
         }
         Long vendUU = inquiryItem.getVendUU();
         Date date = new Date();
@@ -51,9 +44,8 @@ public class PurchaseInquiryItemReplyReleaseEvent extends SaveReleaseEvent<Pagin
         Long enUU = inquiryItem.getInquiry().getEnUU();
         Long userUU = inquiryItem.getUserUU();
         String userName = "操作员";
-        if (null != userUU) {
-            User user = userDao.findOne(userUU);
-            userName = user.getUserName();
+        if (null == userUU) {
+           userUU = 1L;
         }
         PagingReleaseDetail releaseDetail = new PagingReleaseDetail(enUU, userUU, userName);
         releaseDetail.setPagingRelease(release);

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

@@ -1,11 +1,8 @@
 package com.uas.platform.b2b.event;
 
-import com.uas.platform.b2b.dao.UserDao;
 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.b2b.model.User;
-import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.Date;
 import java.util.List;
@@ -18,9 +15,6 @@ import java.util.List;
  */
 public class PurchaseInquiryItemSaveReleaseEvent extends SaveReleaseEvent<PagingReleaseDetail, PurchaseInquiryItem> {
 
-    @Autowired
-    private UserDao userDao;
-
     public PurchaseInquiryItemSaveReleaseEvent(List<PurchaseInquiryItem> savedList) {
         super(savedList);
     }
@@ -35,6 +29,9 @@ public class PurchaseInquiryItemSaveReleaseEvent extends SaveReleaseEvent<Paging
     public PagingReleaseDetail release(PurchaseInquiryItem inquiryItem) {
         //TODO 保存erp新询价单之后，触发新增消息事件。
         Long emUU = inquiryItem.getUserUU();
+        if (null == emUU) {
+            emUU = 1L;
+        }
         String emName = inquiryItem.getInquiry().getRecorder();
         Long enUU = inquiryItem.getInquiry().getEnUU();
         Date date = new Date();
@@ -50,9 +47,8 @@ public class PurchaseInquiryItemSaveReleaseEvent extends SaveReleaseEvent<Paging
         Long vendUU = inquiryItem.getVendUU();
         Long vendUserUU = inquiryItem.getVendUserUU();
         String vendUserName = "操作员";
-        if (null != vendUserUU) {
-            User vendUser = userDao.findOne(vendUserUU);
-            vendUserName = vendUser.getUserName();
+        if (null == vendUserUU) {
+            vendUserUU = 1L;
         }
         PagingReleaseDetail releaseDetail = new PagingReleaseDetail(vendUU, vendUserUU, vendUserName);
         releaseDetail.setPagingRelease(release);

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

@@ -138,21 +138,17 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 			if (orderAll.getUser() == null) {
 				User user = userDao.findOne(orderAll.getUserUU());
 				if (user == null) {
-
 					Enterprise enterprise = enterpriseDao.findOne(orderAll.getEnUU());
 					user = userDao.findOne(enterprise.getEnAdminuu());
 				}
 				orderAll.setUser(user);
 			}
-			if (orderAll.getVendUserUU() != null) {
-				User vendorUser = userDao.findOne(orderAll.getVendUserUU());
-				if (vendorUser == null) { // 如果不存在对应的vendorUser，消息中就设置为企业管理员
-					Enterprise vendor = enterpriseDao.findOne(orderAll.getVendUU());
-					orderAll.setVendUserUU(vendor.getEnAdminuu());
-				}
-				newOrderAlls.add(orderAll);
-				pagingReleaseDao.updateOrderStatus(orderAll.getStatus(), orderAll.getId());
-			}
+			if (orderAll.getVendUserUU() == null) { // 为空设置成企业管理员
+                Enterprise vendor = enterpriseDao.findOne(orderAll.getVendUU());
+                orderAll.setVendUserUU(vendor.getEnAdminuu());
+            }
+            newOrderAlls.add(orderAll);
+            pagingReleaseDao.updateOrderStatus(orderAll.getStatus(), orderAll.getId());
 		}
 		ContextUtils.publishEvent(new PurchaseOrderSaveReleaseEvent(orderAlls));
 		// 对接收人来说是销售订单 ，新增不传旧单据状态