产生消息修改；添加已注册用户时，输入未注册手机号会显示空信息列表的问题处理。

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

src/main/java/com/uas/platform/b2b/erp/service/impl/InquiryServiceImpl.java

@@ -1,34 +1,20 @@
 package com.uas.platform.b2b.erp.service.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.uas.platform.b2b.dao.EnterpriseDao;
-import com.uas.platform.b2b.dao.ProductDao;
-import com.uas.platform.b2b.dao.PurchaseInquiryDao;
-import com.uas.platform.b2b.dao.PurchaseInquiryItemDao;
-import com.uas.platform.b2b.dao.SaleQuotationItemDao;
-import com.uas.platform.b2b.dao.UserDao;
-import com.uas.platform.b2b.dao.VendorDao;
+import com.uas.platform.b2b.dao.*;
 import com.uas.platform.b2b.erp.model.Inquiry;
 import com.uas.platform.b2b.erp.model.InquiryDecide;
 import com.uas.platform.b2b.erp.model.InquiryDetail;
 import com.uas.platform.b2b.erp.service.InquiryService;
-import com.uas.platform.b2b.model.Enterprise;
-import com.uas.platform.b2b.model.Product;
-import com.uas.platform.b2b.model.PurchaseInquiry;
-import com.uas.platform.b2b.model.PurchaseInquiryItem;
-import com.uas.platform.b2b.model.SaleQuotation;
-import com.uas.platform.b2b.model.SaleQuotationItem;
-import com.uas.platform.b2b.model.User;
-import com.uas.platform.b2b.model.Vendor;
+import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.model.Status;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 @Service
 public class InquiryServiceImpl implements InquiryService {
@@ -67,6 +53,10 @@ public class InquiryServiceImpl implements InquiryService {
 					for (PurchaseInquiryItem item : purchaseInquiry.getInquiryItems()) {
 						item.setErpDate(new Date());// 存储时间
 						Vendor vendor = null;
+						// 不存在先设置
+						if (item.getUserUU() == null || item.getUserUU() == 0) {
+							item.setUserUU(SystemSession.getUser().getUserUU());
+						}
 						List<Vendor> vendors = vendorDao.findByMyEnUUAndVendUU(purchaseInquiry.getEnUU(), item.getVendUU());
 						if (vendors.size() > 0) {
 							vendor = vendors.get(0);
@@ -74,10 +64,8 @@ public class InquiryServiceImpl implements InquiryService {
 							if (item.getVendUserUU() == null || item.getVendUserUU() == 0) {
 								item.setVendUserUU(vendor.getVendUserUU());
 							}
-							if (item.getUserUU() == null || item.getUserUU() == 0) {
-								item.setUserUU(SystemSession.getUser().getUserUU());
-							}
 						} else {
+							// 添加供应商资料
 							vendor = addVendor(item);
 						}
 						if (vendor != null) {

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

@@ -1,8 +1,11 @@
 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;
@@ -15,6 +18,9 @@ import java.util.List;
  */
 public class PurchaseInquiryItemDecideReleaseEvent extends SaveReleaseEvent<PagingReleaseDetail, PurchaseInquiryItem> {
 
+    @Autowired
+    private UserDao userDao;
+
     public PurchaseInquiryItemDecideReleaseEvent(List<PurchaseInquiryItem> savedList) {
         super(savedList);
     }
@@ -48,7 +54,12 @@ public class PurchaseInquiryItemDecideReleaseEvent extends SaveReleaseEvent<Pagi
         PagingRelease release = new PagingRelease(emUU, emName, enUU, date, codeValue, from, title, context, type);
         Long vendUU = inquiryItem.getVendUU();
         Long vendUserUU = inquiryItem.getVendUserUU();
-        PagingReleaseDetail releaseDetail = new PagingReleaseDetail(vendUU, vendUserUU);
+        String vendUserName = "操作员";
+        if (null != vendUserUU) {
+            User vendUser = userDao.findOne(vendUserUU);
+            vendUserName = vendUser.getUserName();
+        }
+        PagingReleaseDetail releaseDetail = new PagingReleaseDetail(vendUU, vendUserUU, vendUserName);
         releaseDetail.setPagingRelease(release);
         return releaseDetail;
     }

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

@@ -1,8 +1,11 @@
 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;
@@ -15,6 +18,9 @@ import java.util.List;
  */
 public class PurchaseInquiryItemInvalidReleaseEvent extends SaveReleaseEvent<PagingReleaseDetail, PurchaseInquiryItem> {
 
+    @Autowired
+    private UserDao userDao;
+
     public PurchaseInquiryItemInvalidReleaseEvent(List<PurchaseInquiryItem> savedList) {
         super(savedList);
     }
@@ -43,7 +49,12 @@ public class PurchaseInquiryItemInvalidReleaseEvent extends SaveReleaseEvent<Pag
         PagingRelease release = new PagingRelease(emUU, emName, enUU, date, codeValue, from, title, context, type);
         Long vendUU = inquiryItem.getVendUU();
         Long vendUserUU = inquiryItem.getVendUserUU();
-        PagingReleaseDetail releaseDetail = new PagingReleaseDetail(vendUU, vendUserUU);
+        String vendUserName = "操作员";
+        if (null != vendUserUU) {
+            User vendUser = userDao.findOne(vendUserUU);
+            vendUserName = vendUser.getUserName();
+        }
+        PagingReleaseDetail releaseDetail = new PagingReleaseDetail(vendUU, vendUserUU, vendUserName);
         releaseDetail.setPagingRelease(release);
         return releaseDetail;
     }

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

@@ -1,8 +1,11 @@
 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;
@@ -13,6 +16,9 @@ import java.util.List;
  */
 public class PurchaseInquiryItemReplyReleaseEvent extends SaveReleaseEvent<PagingReleaseDetail, PurchaseInquiryItem> {
 
+    @Autowired
+    private UserDao userDao;
+
 
     public PurchaseInquiryItemReplyReleaseEvent(List<PurchaseInquiryItem> savedList) {
         super(savedList);
@@ -29,6 +35,10 @@ 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();
+        }
         Long vendUU = inquiryItem.getVendUU();
         Date date = new Date();
         String codeValue = inquiryItem.getInquiry().getCode();
@@ -40,7 +50,12 @@ public class PurchaseInquiryItemReplyReleaseEvent extends SaveReleaseEvent<Pagin
         PagingRelease release = new PagingRelease(emUU, emName, vendUU, date, codeValue, from, title, context, type);
         Long enUU = inquiryItem.getInquiry().getEnUU();
         Long userUU = inquiryItem.getUserUU();
-        PagingReleaseDetail releaseDetail = new PagingReleaseDetail(enUU, userUU);
+        String userName = "操作员";
+        if (null != userUU) {
+            User user = userDao.findOne(userUU);
+            userName = user.getUserName();
+        }
+        PagingReleaseDetail releaseDetail = new PagingReleaseDetail(enUU, userUU, userName);
         releaseDetail.setPagingRelease(release);
         return releaseDetail;
     }

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

@@ -1,8 +1,11 @@
 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;
@@ -15,6 +18,8 @@ import java.util.List;
  */
 public class PurchaseInquiryItemSaveReleaseEvent extends SaveReleaseEvent<PagingReleaseDetail, PurchaseInquiryItem> {
 
+    @Autowired
+    private UserDao userDao;
 
     public PurchaseInquiryItemSaveReleaseEvent(List<PurchaseInquiryItem> savedList) {
         super(savedList);
@@ -44,7 +49,12 @@ public class PurchaseInquiryItemSaveReleaseEvent extends SaveReleaseEvent<Paging
         PagingRelease release = new PagingRelease(emUU, emName, enUU, date, codeValue, from, title, context, type);
         Long vendUU = inquiryItem.getVendUU();
         Long vendUserUU = inquiryItem.getVendUserUU();
-        PagingReleaseDetail releaseDetail = new PagingReleaseDetail(vendUU, vendUserUU);
+        String vendUserName = "操作员";
+        if (null != vendUserUU) {
+            User vendUser = userDao.findOne(vendUserUU);
+            vendUserName = vendUser.getUserName();
+        }
+        PagingReleaseDetail releaseDetail = new PagingReleaseDetail(vendUU, vendUserUU, vendUserName);
         releaseDetail.setPagingRelease(release);
         return releaseDetail;
     }

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

@@ -1,9 +1,12 @@
 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.PurchaseOrderItem;
+import com.uas.platform.b2b.model.User;
 import com.uas.platform.core.model.Constant;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.Date;
 import java.util.List;
@@ -15,6 +18,9 @@ import java.util.List;
  */
 public class PurchaseOrderEndReleaseEvent extends SaveReleaseEvent<PagingReleaseDetail, PurchaseOrderItem> {
 
+    @Autowired
+    private UserDao userDao;
+
     public PurchaseOrderEndReleaseEvent(List<PurchaseOrderItem> savedList) {
         super(savedList);
     }
@@ -48,7 +54,12 @@ public class PurchaseOrderEndReleaseEvent extends SaveReleaseEvent<PagingRelease
         PagingRelease release = new PagingRelease(emUU, emName, enUU, date, codeValue, from, title, context, type);
         Long vendUU = item.getOrder().getVendUU();
         Long vendUserUU = item.getOrder().getVendUserUU();
-        PagingReleaseDetail releaseDetail = new PagingReleaseDetail(vendUU, vendUserUU);
+        String vendUserName = "操作员";
+        if (null != vendUserUU) {
+            User vendUser = userDao.findOne(vendUserUU);
+            vendUserName = vendUser.getUserName();
+        }
+        PagingReleaseDetail releaseDetail = new PagingReleaseDetail(vendUU, vendUserUU, vendUserName);
         releaseDetail.setPagingRelease(release);
         return releaseDetail;
     }

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

@@ -1,8 +1,11 @@
 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.PurchaseOrder;
+import com.uas.platform.b2b.model.User;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.Date;
 import java.util.List;
@@ -14,6 +17,9 @@ import java.util.List;
  */
 public class PurchaseOrderReplyReleaseEvent extends SaveReleaseEvent<PagingReleaseDetail, PurchaseOrder> {
 
+    @Autowired
+    private UserDao userDao;
+
     public PurchaseOrderReplyReleaseEvent(List<PurchaseOrder> savedList) {
         super(savedList);
     }
@@ -28,7 +34,16 @@ public class PurchaseOrderReplyReleaseEvent extends SaveReleaseEvent<PagingRelea
     public PagingReleaseDetail release(PurchaseOrder orderAll) {
         // 回复订单的话，跟新增订单是相反的，所以接收人是user，发出人是venduser
         Long emUU = orderAll.getVendUserUU();
-        String emName = orderAll.getVenduser();
+        String emName = "操作员";  // 默认一个值，避免为空
+        if (null != orderAll.getVenduser()) {
+            emName = orderAll.getVenduser();
+        } else {
+            // 采购单没有就根据供应商用户UU号去找
+            if (null != emUU) {
+                User vendUser = userDao.findOne(emUU);
+                emName = vendUser.getUserName();
+            }
+        }
         Long vendUU = orderAll.getVendUU();
         Date date = new Date();
         String codeValue = orderAll.getCode();
@@ -39,8 +54,13 @@ public class PurchaseOrderReplyReleaseEvent extends SaveReleaseEvent<PagingRelea
         PagingRelease release = new PagingRelease(emUU, emName, vendUU, date, codeValue, from, title, context, type);
         Long enUU = orderAll.getEnUU();
         Long userUU = orderAll.getUserUU();
-        PagingReleaseDetail releaseDetail = new PagingReleaseDetail(enUU, userUU);
+        String userName = "操作员";
+        if (null != userUU) {
+            User user = userDao.findOne(userUU);
+            userName = user.getUserName();
+        }
+        PagingReleaseDetail releaseDetail = new PagingReleaseDetail(enUU, userUU, userName);
         releaseDetail.setPagingRelease(release);
         return releaseDetail;
     }
-}
+}

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

@@ -1,8 +1,11 @@
 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.PurchaseOrderAll;
+import com.uas.platform.b2b.model.User;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.Date;
 import java.util.List;
@@ -14,6 +17,9 @@ import java.util.List;
  */
 public class PurchaseOrderSaveReleaseEvent extends SaveReleaseEvent<PagingReleaseDetail, PurchaseOrderAll> {
 
+    @Autowired
+    private UserDao userDao;
+
     public PurchaseOrderSaveReleaseEvent(List<PurchaseOrderAll> savedList) {
         super(savedList);
     }
@@ -42,7 +48,12 @@ public class PurchaseOrderSaveReleaseEvent extends SaveReleaseEvent<PagingReleas
         PagingRelease release = new PagingRelease(emUU, emName, enUU, date, codeValue, from, title, context, type);
         Long vendUU = orderAll.getVendUU();
         Long vendUserUU = orderAll.getVendUserUU();
-        PagingReleaseDetail releaseDetail = new PagingReleaseDetail(vendUU, vendUserUU);
+        String vendUserName = "操作员";
+        if (null != vendUserUU) {
+            User vendUser = userDao.findOne(vendUserUU);
+            vendUserName = vendUser.getUserName();
+        }
+        PagingReleaseDetail releaseDetail = new PagingReleaseDetail(vendUU, vendUserUU, vendUserName);
         releaseDetail.setPagingRelease(release);
         return releaseDetail;
     }

src/main/java/com/uas/platform/b2b/model/PagingReleaseDetail.java

@@ -97,9 +97,10 @@ public class PagingReleaseDetail implements Serializable{
     public PagingReleaseDetail() {
     }
 
-    public PagingReleaseDetail(Long vendUU, Long vendUserUU) {
+    public PagingReleaseDetail(Long vendUU, Long vendUserUU, String vendUserName) {
         this.vendUU = vendUU;
         this.vendUserUU = vendUserUU;
+        this.vendUserName = vendUserName;
         this.readStatus = Constant.NO;
         this.status = Constant.NO;
         this.pushStatus = Constant.NO;

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

@@ -1,38 +1,9 @@
 package com.uas.platform.b2b.service.impl;
 
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
-
 import com.uas.account.entity.UserDetail;
 import com.uas.account.util.AccountUtils;
-import com.uas.platform.b2b.dao.CommonDao;
-import com.uas.platform.b2b.dao.DistributeDao;
-import com.uas.platform.b2b.dao.EnterpriseDao;
-import com.uas.platform.b2b.dao.RoleDao;
-import com.uas.platform.b2b.dao.UserDao;
-import com.uas.platform.b2b.dao.VendorDao;
-import com.uas.platform.b2b.model.Distribute;
-import com.uas.platform.b2b.model.Enterprise;
-import com.uas.platform.b2b.model.Role;
-import com.uas.platform.b2b.model.SearchFilter;
-import com.uas.platform.b2b.model.User;
-import com.uas.platform.b2b.model.UserInfo;
-import com.uas.platform.b2b.model.Vendor;
+import com.uas.platform.b2b.dao.*;
+import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.service.UserService;
 import com.uas.platform.b2b.service.VendorService;
 import com.uas.platform.b2b.support.SendMailService;
@@ -45,6 +16,15 @@ import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.util.AgentUtils;
 import com.uas.platform.core.util.encry.Md5Utils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
  * @since 2016-9-26 21:18:35 账户中心统一管理；部分功能保留，但转移到v2目录
@@ -130,15 +110,15 @@ public class UserServiceImpl implements UserService {
 	public User findUserByUserTel(String tel) {
 		List<User> users = userDao.findUserByUserTel(tel);
 		User user = new User();
-		// if (users.size() == 0) {
-//			throw new UsernameNotFoundException("没有找到您的账号 " + tel);
-		// } else {
-		// return users.get(0);
-		// }
-		if (!CollectionUtils.isEmpty(users)) {
-			user = users.get(0);
+		if (users.size() == 0) {
+			throw new UsernameNotFoundException("没有找到您的账号 " + tel);
+		} else {
+			return users.get(0);
 		}
-		return user;
+//		if (!CollectionUtils.isEmpty(users)) {
+//			user = users.get(0);
+//		}
+//		return user;
 	}
 
 	public boolean bindUser(String userUU, String enUU) {