将询价报价、发货、订单回复、主动报价的个人物料关联方法更新

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

@@ -5,8 +5,8 @@ import com.uas.platform.b2b.dao.*;
 import com.uas.platform.b2b.erp.model.Inquiry;
 import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.ps.InquiryUtils;
+import com.uas.platform.b2b.ps.service.PersonalProductService;
 import com.uas.platform.b2b.service.AttachService;
-import com.uas.platform.b2b.service.ProductUsersService;
 import com.uas.platform.b2b.service.PubInquiryService;
 import com.uas.platform.b2b.service.RoleService;
 import com.uas.platform.b2b.support.SPageUtils;
@@ -75,9 +75,6 @@ public class PubInquiryServiceImpl implements PubInquiryService {
     @Autowired
     private PublicInquiryItemInfoDao publicInquiryItemInfoDao;
 
-    @Autowired
-    private ProductUsersService productUsersService;
-
     @Autowired
     private AttachService attachService;
 
@@ -91,6 +88,9 @@ public class PubInquiryServiceImpl implements PubInquiryService {
      */
     private final String INQUIRYKIND = "publicInquiry";
 
+    @Autowired
+    private PersonalProductService personalProductService;
+
     /**
      * 将公共询价列表转成需要报价的询价单，类型是公共询价
      *
@@ -321,7 +321,8 @@ public class PubInquiryServiceImpl implements PubInquiryService {
         }
         PublicInquiryItem purchaseInquiryItem = publicInquiryItemDao.save(inquiryItem);
         // 更新个人物料库信息
-        productUsersService.coverToMyProduct(purchaseInquiryItem.getProductId(), SystemSession.getUser().getEnterprise().getUu(), SystemSession.getUser().getUserUU(), "客户询价单报价");
+        Long prId = purchaseInquiryItem.getProductId();
+        personalProductService.covertPersonalProduct(prId, "客户询价单报价");
         return purchaseInquiryItem;
     }
 

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

@@ -13,9 +13,9 @@ import com.uas.platform.b2b.event.PurchaseInquiryItemSaveReleaseEvent;
 import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.ps.InquiryUtils;
 import com.uas.platform.b2b.ps.ProductUtils;
+import com.uas.platform.b2b.ps.service.PersonalProductService;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.AttachService;
-import com.uas.platform.b2b.service.ProductUsersService;
 import com.uas.platform.b2b.service.PurchaseInquiryService;
 import com.uas.platform.b2b.support.MessageConf;
 import com.uas.platform.b2b.support.SystemSession;
@@ -116,12 +116,10 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 	@Autowired
 	private PurchaseInquiryTempDao inquiryTempDao;
 
-    static final String TEL_REGEXP = "^((\\(\\d{3}\\))|(\\d{3}\\-))?(13|15|18|17)\\d{9}$";
-
     static final String EMAIL_REGEXP = "\\w[-\\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\\.)+[A-Za-z]{2,14}";
 
     @Autowired
-    private ProductUsersService productUsersService;
+    private PersonalProductService personalProductService;
 
     @Override
     public void saveList(List<PurchaseInquiryItemTemp> purchaseInquiryItemTemps) {
@@ -174,30 +172,6 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 		}
     }
 
-    /**
-	 * 产生消息
-	 * @param inquiryItems
-	 */
-	private void sendMessage(final List<PurchaseInquiryItem> inquiryItems) {
-		ThreadTask.getInstance().execute(new Runnable() {
-			@Override
-			public void run() {
-				List<PurchaseInquiry> inquiries = PurchaseInquiryItem.distinct(inquiryItems);
-				List<PurchaseInquiryItem> items = new ArrayList<>();
-				for (PurchaseInquiry inquiry : inquiries) {
-					Set<Long> enUUs = new HashSet<>();
-					for (PurchaseInquiryItem inquiryItem : inquiry.getInquiryItems()) {
-						if (!enUUs.contains(inquiryItem.getVendUU())) {
-							items.add(inquiryItem);
-							enUUs.add(inquiryItem.getVendUU());
-						}
-					}
-				}
-				ContextUtils.publishEvent(new PurchaseInquiryItemSaveReleaseEvent(items));
-			}
-		});
-	}
-
 	/**
 	 * 保存至用户单据表
 	 *
@@ -721,7 +695,7 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 	@Override
 	@Transactional
 	public PurchaseInquiryItem reply(PurchaseInquiryItem inquiryItem) {
-		PurchaseInquiryItem item = purchaseInquiryItemDao.findOne(inquiryItem.getId());
+        PurchaseInquiryItem item = purchaseInquiryItemDao.findOne(inquiryItem.getId());
 		if (!item.isReplyable())
 			throw new IllegalStatusException("该询价单已经报价，不允许再次报价");
 		if ((item.getInquiry().getCheck() != null && item.getInquiry().getCheck() == Constant.YES) || (item.getAgreed() != null))
@@ -735,7 +709,7 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 		inquiryItem.setDecideStatus((short) Status.UNAUDIT.value());
 		// 防回复记录重复
 		checkInquiryItemReplies(inquiryItem, item);
-		Long userUU = inquiryItem.getUserUU();
+        Long userUU = inquiryItem.getUserUU();
 		if (userUU == null) {
 			userUU = item.getInquiry().getRecorderUU();
 		}
@@ -755,8 +729,8 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 		// 将采购员单据设置未读
 		userOrderDao.setReadStatus(purchaseInquiryItem.getInquiry().getEnUU(), purchaseInquiryItem.getInquiry().getRecorderUU(), "v$purc$inquiryitems", "purc", (short) Status.NOT_READ.value(), purchaseInquiryItem.getId());
 		// 更新个人物料库信息
-        productUsersService.coverToMyProduct(purchaseInquiryItem.getProductId(), SystemSession.getUser().getEnterprise().getUu(), SystemSession.getUser().getUserUU(), "客户询价单报价");
-		return purchaseInquiryItem;
+        personalProductService.covertPersonalProduct(purchaseInquiryItem.getProductId(), "客户询价单报价");
+        return purchaseInquiryItem;
 	}
 
 	@Override

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

@@ -3,7 +3,6 @@ package com.uas.platform.b2b.service.impl;
 import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.core.util.SplitArray;
 import com.uas.platform.b2b.core.util.ThreadTask;
-import com.uas.platform.b2b.core.util.ThreadUtils;
 import com.uas.platform.b2b.dao.*;
 import com.uas.platform.b2b.erp.model.PurchaseNotify;
 import com.uas.platform.b2b.event.PurchaseNoticeEndReleaseEvent;
@@ -11,8 +10,8 @@ import com.uas.platform.b2b.event.PurchaseNoticeSaveReleaseEvent;
 import com.uas.platform.b2b.event.SaleSendAcceptReleaseEvent;
 import com.uas.platform.b2b.event.SaleSendRefuseReleaseEvent;
 import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.ps.service.PersonalProductService;
 import com.uas.platform.b2b.search.SearchService;
-import com.uas.platform.b2b.service.ProductUsersService;
 import com.uas.platform.b2b.service.PurchaseNoticeService;
 import com.uas.platform.b2b.support.SPageUtils;
 import com.uas.platform.b2b.support.SystemSession;
@@ -105,7 +104,7 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
 	private VendorDao vendorDao;
 
 	@Autowired
-    private ProductUsersService productUsersService;
+    private PersonalProductService personalProductService;
 
 	@Override
 	public void save(List<PurchaseNotice> notices) {
@@ -385,7 +384,7 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
 				}
 			}
 		}
-		purchaseNoticeDao.save(saveList);
+        purchaseNoticeDao.save(saveList);
 		ContextUtils.publishEvent(new PurchaseNoticeEndReleaseEvent(saveList));
 	}
 
@@ -454,15 +453,7 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
 				saleSends.add(sendItems.get(0).getSend());
 			}
 			// 我的产品库更新
-			final Long enUU = SystemSession.getUser().getEnterprise().getUu();
-			final Long userUU = SystemSession.getUser().getUserUU();
-			final Long productId = notice.getOrderItem().getProductId();
-			ThreadUtils.task(new Runnable() {
-				@Override
-				public void run() {
-					productUsersService.coverToMyProduct(productId, enUU, userUU, "单个发货");
-				}
-			}).run();
+            personalProductService.covertPersonalProduct(notice.getOrderItem().getProductId(), "单个发货");
 			return sendItems.get(0).getSend();
 		} else {
 			throw new IllegalOperatorException("请对有效的送货提醒发货！");
@@ -528,7 +519,7 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
 						(short) (endQty == notice.getQty() ? Status.REPLIED.value() : Status.NOT_REPLY.value()));
 				purchaseNoticeDao.save(notice);
                 // 转入我的物料库
-                productUsersService.coverToMyProduct(notice.getOrderItem().getProductId(), SystemSession.getUser().getEnterprise().getUu(), SystemSession.getUser().getUserUU(), "批量发货");
+                personalProductService.covertPersonalProduct(notice.getOrderItem().getProductId(), "批量发货");
 			}
 			if (!CollectionUtils.isEmpty(sendItems)) {
 				List<SaleSend> saleSends = new ArrayList<SaleSend>();

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

@@ -10,7 +10,7 @@ import com.uas.platform.b2b.event.PurchaseOrderReplyReleaseEvent;
 import com.uas.platform.b2b.event.PurchaseOrderSaveReleaseEvent;
 import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.ps.ProductUtils;
-import com.uas.platform.b2b.service.ProductUsersService;
+import com.uas.platform.b2b.ps.service.PersonalProductService;
 import com.uas.platform.b2b.service.PurchaseOrderService;
 import com.uas.platform.b2b.support.SPageUtils;
 import com.uas.platform.b2b.support.SystemSession;
@@ -99,7 +99,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
     private CommonDao commonDao;
 
 	@Autowired
-    private ProductUsersService productUsersService;
+    private PersonalProductService personalProductService;
 
 	@Autowired
 	private ProductTempDao productTempDao;
@@ -126,7 +126,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
             // 更新我的产品库
             if(!CollectionUtils.isEmpty(orderAll.getOrderItems())) {
 			    for(PurcOrderInfoItem item : orderAll.getOrderItems()) {
-                    productUsersService.coverToMyProduct(item.getProductId(), orderAll.getVendUU(), orderAll.getVendUserUU(), "erp上传采购单");
+					personalProductService.covertPersonalProduct(item.getProductId(), "erp上传采购单");
                 }
             }
             newOrderAlls.add(orderAll);

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

@@ -6,7 +6,7 @@ import com.uas.platform.b2b.erp.model.Inquiry;
 import com.uas.platform.b2b.event.SaleQuotationDecideReleaseEvent;
 import com.uas.platform.b2b.event.SaleQuotationInvalidReleaseEvent;
 import com.uas.platform.b2b.model.*;
-import com.uas.platform.b2b.service.ProductUsersService;
+import com.uas.platform.b2b.ps.service.PersonalProductService;
 import com.uas.platform.b2b.service.SaleQuotationService;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.exception.NotFoundException;
@@ -50,7 +50,7 @@ public class SaleQuotationServiceImpl implements SaleQuotationService {
 	private SaleQuotationDoneDao saleQuotationDoneDao;
 
 	@Autowired
-    private ProductUsersService productUsersService;
+    private PersonalProductService personalProductService;
 
 	@Override
 	public void save(List<SaleQuotationItem> items) {
@@ -116,7 +116,7 @@ public class SaleQuotationServiceImpl implements SaleQuotationService {
 		List<SaleQuotationItem> list = new ArrayList<SaleQuotationItem>();
 		list.add(newItem);
         // 更新我的物料库信息
-        productUsersService.coverToMyProduct(item.getProductId(), SystemSession.getUser().getEnterprise().getUu(), SystemSession.getUser().getUserUU(), "主动报价");
+		personalProductService.covertPersonalProduct(item.getProductId(), "主动报价");
 		return newItem;
 	}