将添加合作伙伴的方法提取出来

src/main/java/com/uas/platform/b2b/erp/controller/RelationshipController.java

@@ -1,13 +1,12 @@
 package com.uas.platform.b2b.erp.controller;
 
-import com.uas.account.util.AccountUtils;
 import com.uas.platform.b2b.dao.EnterpriseDao;
 import com.uas.platform.b2b.dao.VendorDao;
+import com.uas.platform.b2b.erp.service.VendorService;
 import com.uas.platform.b2b.model.Enterprise;
 import com.uas.platform.b2b.model.Vendor;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
-import com.uas.platform.b2b.temporary.model.PartnershipRecord;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.Constant;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +32,9 @@ public class RelationshipController {
 	@Autowired
 	private EnterpriseDao enterpriseDao;
 
+	@Autowired
+	private VendorService vendorService;
+
 	private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
 
 	@RequestMapping(method = RequestMethod.POST)
@@ -43,6 +45,7 @@ public class RelationshipController {
 		boolean ok = true;
 		String error = null;
 		long enUU = SystemSession.getUser().getEnterprise().getUu();
+        final String appId = "uas";// 应用来源
 		if (!StringUtils.isEmpty(otheruu)) {
 			Enterprise enterprise = enterpriseDao.findEnterpriseByUu(otheruu);
 			if (enterprise != null) {
@@ -51,7 +54,7 @@ public class RelationshipController {
 					Vendor vendor = addVendor(otheruu, enUU);// 添加企业的供应商资料
 					// 添加企业圈合作伙伴资料
 					if (null != vendor) {
-						addPartnerShipRecord(vendor);
+						vendorService.addPartnerShipRecord(vendor, appId);
 					}
 				}
 			} else {
@@ -64,31 +67,6 @@ public class RelationshipController {
 		return infos;
 	}
 
-	private void addPartnerShipRecord(Vendor vendor) {
-		PartnershipRecord shipRecord = new PartnershipRecord("uas", vendor);
-		com.uas.account.entity.PartnershipRecord record = new com.uas.account.entity.PartnershipRecord();
-		record.setAppId(shipRecord.getAppId());
-		record.setCustName(shipRecord.getCustName());
-		record.setCustUID(shipRecord.getCustUID());
-		record.setCustUserCode(shipRecord.getCustUserCode());
-		record.setCustUserEmail(shipRecord.getCustUserEmail());
-		record.setCustUserName(shipRecord.getCustUserName());
-		record.setCustUserTel(shipRecord.getCustUserTel());
-		record.setVendName(shipRecord.getVendName());
-		record.setVendUID(shipRecord.getVendUID());
-		record.setVendUserCode(shipRecord.getVendUserCode());
-		record.setVendUserEmail(shipRecord.getVendUserEmail());
-		record.setVendUserName(shipRecord.getVendUserName());
-		record.setVendUserTel(shipRecord.getVendUserTel());
-		try {
-			AccountUtils.synchronizeRecord(record);
-			vendor.setSynchStatus(Constant.YES);
-			vendorDao.save(vendor);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
 	private Vendor addVendor(Long enuu, Long venduu) {
 		Vendor vendor = new Vendor();
 		vendor.setMyEnUU(enuu);

src/main/java/com/uas/platform/b2b/erp/service/VendorService.java

@@ -1,6 +1,7 @@
 package com.uas.platform.b2b.erp.service;
 
 import com.uas.platform.b2b.erp.model.InquiryVendorInfo;
+import com.uas.platform.b2b.model.Vendor;
 
 import java.util.List;
 
@@ -29,4 +30,12 @@ public interface VendorService {
      * @param ids
      */
     void updateStatus(String ids);
+
+    /**
+     * 添加合作伙伴
+     *
+     * @param vendor 供应商资料
+     * @param appId 应用来源
+     */
+    void addPartnerShipRecord(Vendor vendor, String appId);
 }

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

@@ -8,6 +8,7 @@ import com.uas.platform.b2b.dao.VendorDao;
 import com.uas.platform.b2b.erp.model.ARCheck;
 import com.uas.platform.b2b.erp.model.ARCheckReply;
 import com.uas.platform.b2b.erp.service.ARCheckService;
+import com.uas.platform.b2b.erp.service.VendorService;
 import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.temporary.model.PartnershipRecord;
@@ -36,9 +37,13 @@ public class ARCheckServiceImpl implements ARCheckService {
 	@Autowired
 	private SaleARCheckItemDao saleARCheckItemDao;
 
+	@Autowired
+	private VendorService vendorService;
+
 	@Override
 	public List<SaleARCheckItem> convertARChecks(List<ARCheck> arChecks) {
 		List<SaleARCheckItem> arCheckItems = new ArrayList<SaleARCheckItem>();
+        final String appId = "uas";// 应用来源
 		long vendUU = SystemSession.getUser().getEnterprise().getUu();// 卖方UU号
 		if (!CollectionUtils.isEmpty(arChecks)) {
 			for (ARCheck arCheck : arChecks) {
@@ -49,7 +54,7 @@ public class ARCheckServiceImpl implements ARCheckService {
 					if (CollectionUtils.isEmpty(existVendors)) {// 不存在供应商关系，增加供应商关系
 						Vendor vendor = addVendor(customer);
 						if (null != vendor) {
-							addPartnerShipRecord(vendor); // 添加合作伙伴关系
+							vendorService.addPartnerShipRecord(vendor, appId); // 添加合作伙伴关系
 						}
 					}
 					SaleARCheck saleARCheck = arCheck.convert();
@@ -66,31 +71,6 @@ public class ARCheckServiceImpl implements ARCheckService {
 		return arCheckItems;
 	}
 
-	private void addPartnerShipRecord(Vendor vendor) {
-		PartnershipRecord shipRecord = new PartnershipRecord("uas", vendor);
-		com.uas.account.entity.PartnershipRecord record = new com.uas.account.entity.PartnershipRecord();
-		record.setAppId(shipRecord.getAppId());
-		record.setCustName(shipRecord.getCustName());
-		record.setCustUID(shipRecord.getCustUID());
-		record.setCustUserCode(shipRecord.getCustUserCode());
-		record.setCustUserEmail(shipRecord.getCustUserEmail());
-		record.setCustUserName(shipRecord.getCustUserName());
-		record.setCustUserTel(shipRecord.getCustUserTel());
-		record.setVendName(shipRecord.getVendName());
-		record.setVendUID(shipRecord.getVendUID());
-		record.setVendUserCode(shipRecord.getVendUserCode());
-		record.setVendUserEmail(shipRecord.getVendUserEmail());
-		record.setVendUserName(shipRecord.getVendUserName());
-		record.setVendUserTel(shipRecord.getVendUserTel());
-		try {
-			AccountUtils.synchronizeRecord(record);
-			vendor.setSynchStatus(Constant.YES);
-			vendorDao.save(vendor);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
 	/**
 	 * 在UU号正确但两者之间不存在供应商关系时，添加供应商关系
 	 * 

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

@@ -6,6 +6,7 @@ import com.uas.platform.b2b.dao.*;
 import com.uas.platform.b2b.erp.model.InquiryMould;
 import com.uas.platform.b2b.erp.model.InquiryMouldDecide;
 import com.uas.platform.b2b.erp.service.InquiryMouldService;
+import com.uas.platform.b2b.erp.service.VendorService;
 import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.temporary.model.PartnershipRecord;
@@ -35,9 +36,13 @@ public class InquiryMouldServiceImpl implements InquiryMouldService {
 	@Autowired
 	private UserDao userDao;
 
+	@Autowired
+	private VendorService vendorService;
+
 	@Override
 	public List<PurchaseInquiryMould> convertInquiryMould(List<InquiryMould> inquiries) {
 		List<PurchaseInquiryMould> purcMould = new ArrayList<PurchaseInquiryMould>();
+		final String appId = "uas";// 应用来源
 		long enUU = SystemSession.getUser().getEnterprise().getUu();
 		for (InquiryMould inquiry : inquiries) {
 			// 先进行判断是否存在
@@ -58,7 +63,7 @@ public class InquiryMouldServiceImpl implements InquiryMouldService {
 				} else {
 					vendor = addVendor(purchaseInquiryMould);
 					if (null != vendor) {
-						addPartnerShipRecord(vendor); // 添加合作伙伴关系
+						vendorService.addPartnerShipRecord(vendor, appId); // 添加合作伙伴关系
 					}
 				}
 				if (vendor != null) {
@@ -95,31 +100,6 @@ public class InquiryMouldServiceImpl implements InquiryMouldService {
 		return purcMould;
 	}
 
-	private void addPartnerShipRecord(Vendor vendor) {
-		PartnershipRecord shipRecord = new PartnershipRecord("uas", vendor);
-		com.uas.account.entity.PartnershipRecord record = new com.uas.account.entity.PartnershipRecord();
-		record.setAppId(shipRecord.getAppId());
-		record.setCustName(shipRecord.getCustName());
-		record.setCustUID(shipRecord.getCustUID());
-		record.setCustUserCode(shipRecord.getCustUserCode());
-		record.setCustUserEmail(shipRecord.getCustUserEmail());
-		record.setCustUserName(shipRecord.getCustUserName());
-		record.setCustUserTel(shipRecord.getCustUserTel());
-		record.setVendName(shipRecord.getVendName());
-		record.setVendUID(shipRecord.getVendUID());
-		record.setVendUserCode(shipRecord.getVendUserCode());
-		record.setVendUserEmail(shipRecord.getVendUserEmail());
-		record.setVendUserName(shipRecord.getVendUserName());
-		record.setVendUserTel(shipRecord.getVendUserTel());
-		try {
-			AccountUtils.synchronizeRecord(record);
-			vendor.setSynchStatus(Constant.YES);
-			vendorDao.save(vendor);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
 	@Override
 	public List<InquiryMould> convertPurchaseInquiryMouldReply(List<PurchaseInquiryMould> purchaseInquiryMoulds) {
 		List<InquiryMould> inquiryMoulds = new ArrayList<InquiryMould>();

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

@@ -15,6 +15,7 @@ import com.uas.platform.b2b.erp.model.InquiryDecide;
 import com.uas.platform.b2b.erp.model.InquiryDetail;
 import com.uas.platform.b2b.erp.model.InquiryDetailDet;
 import com.uas.platform.b2b.erp.service.InquiryService;
+import com.uas.platform.b2b.erp.service.VendorService;
 import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
 import com.uas.platform.b2b.event.PurchaseInquiryItemSaveReleaseEvent;
 import com.uas.platform.b2b.model.Enterprise;
@@ -69,6 +70,9 @@ public class InquiryServiceImpl implements InquiryService {
 	@Autowired
     private CommonDao commonDao;
 
+	@Autowired
+	private VendorService vendorService;
+
     private final static ErpBufferedLogger logger = BufferedLoggerManager.getLogger(ErpBufferedLogger.class);
 
 	private final static UsageBufferedLogger usageLogger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
@@ -76,6 +80,7 @@ public class InquiryServiceImpl implements InquiryService {
 	@Override
 	public List<PurchaseInquiryItem> convertInquiry(List<Inquiry> inquiries) {
 		List<PurchaseInquiryItem> inquiryItems = new ArrayList<PurchaseInquiryItem>();
+		final String appId = "uas";// 应用来源
 		long enUU = SystemSession.getUser().getEnterprise().getUu();
 		for (Inquiry inquiry : inquiries) {
 			// 先查看是否已存在
@@ -109,7 +114,7 @@ public class InquiryServiceImpl implements InquiryService {
 							vendor = addVendor(item);
 							// 添加合作伙伴关系
 							if (null != vendor) {
-								addPartnerShipRecord(vendor);
+								vendorService.addPartnerShipRecord(vendor, appId);
 							}
 						}
 						if (vendor != null) {
@@ -131,31 +136,6 @@ public class InquiryServiceImpl implements InquiryService {
 		return inquiryItems;
 	}
 
-	private void addPartnerShipRecord(Vendor vendor) {
-		PartnershipRecord shipRecord = new PartnershipRecord("uas", vendor);
-		com.uas.account.entity.PartnershipRecord record = new com.uas.account.entity.PartnershipRecord();
-		record.setAppId(shipRecord.getAppId());
-		record.setCustName(shipRecord.getCustName());
-		record.setCustUID(shipRecord.getCustUID());
-		record.setCustUserCode(shipRecord.getCustUserCode());
-		record.setCustUserEmail(shipRecord.getCustUserEmail());
-		record.setCustUserName(shipRecord.getCustUserName());
-		record.setCustUserTel(shipRecord.getCustUserTel());
-		record.setVendName(shipRecord.getVendName());
-		record.setVendUID(shipRecord.getVendUID());
-		record.setVendUserCode(shipRecord.getVendUserCode());
-		record.setVendUserEmail(shipRecord.getVendUserEmail());
-		record.setVendUserName(shipRecord.getVendUserName());
-		record.setVendUserTel(shipRecord.getVendUserTel());
-		try {
-			AccountUtils.synchronizeRecord(record);
-			vendor.setSynchStatus(Constant.YES);
-			vendorDao.save(vendor);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
 	@Override
 	public List<InquiryDetail> convertPurchaseInquiryReply(List<PurchaseInquiryItem> inquiryItems) {
 		List<InquiryDetail> details = new ArrayList<InquiryDetail>();

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

@@ -10,6 +10,7 @@ import com.uas.platform.b2b.erp.model.Make;
 import com.uas.platform.b2b.erp.model.MakeEnd;
 import com.uas.platform.b2b.erp.model.MakeReply;
 import com.uas.platform.b2b.erp.service.MakeService;
+import com.uas.platform.b2b.erp.service.VendorService;
 import com.uas.platform.b2b.event.MakeOrderEndReleaseEvent;
 import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.support.SystemSession;
@@ -39,9 +40,13 @@ public class MakeServiceImpl implements MakeService {
 	@Autowired
 	private VendorDao vendorDao;
 
+	@Autowired
+	private VendorService vendorService;
+
 	@Override
 	public List<MakeOrder> convertMakes(List<Make> makes) {
 		List<MakeOrder> makeOrders = new ArrayList<MakeOrder>();
+        final String appId = "uas";// 应用来源
 		long enUU = SystemSession.getUser().getEnterprise().getUu();
 		for (Make make : makes) {
 			List<MakeOrder> orders = makeOrderDao.findByEnUUAndCode(enUU, make.getMa_code());
@@ -57,7 +62,7 @@ public class MakeServiceImpl implements MakeService {
 				if (CollectionUtils.isEmpty(vendors)) {
 					vend = addVendor(make);
 					if (null != vend) {
-						addPartnerShipRecord(vend); // 添加合作伙伴
+						vendorService.addPartnerShipRecord(vend, appId); // 添加合作伙伴
 					}
 				} else {
 					vend = vendors.get(0);
@@ -71,31 +76,6 @@ public class MakeServiceImpl implements MakeService {
 		return makeOrders;
 	}
 
-	private void addPartnerShipRecord(Vendor vendor) {
-		PartnershipRecord shipRecord = new PartnershipRecord("uas", vendor);
-		com.uas.account.entity.PartnershipRecord record = new com.uas.account.entity.PartnershipRecord();
-		record.setAppId(shipRecord.getAppId());
-		record.setCustName(shipRecord.getCustName());
-		record.setCustUID(shipRecord.getCustUID());
-		record.setCustUserCode(shipRecord.getCustUserCode());
-		record.setCustUserEmail(shipRecord.getCustUserEmail());
-		record.setCustUserName(shipRecord.getCustUserName());
-		record.setCustUserTel(shipRecord.getCustUserTel());
-		record.setVendName(shipRecord.getVendName());
-		record.setVendUID(shipRecord.getVendUID());
-		record.setVendUserCode(shipRecord.getVendUserCode());
-		record.setVendUserEmail(shipRecord.getVendUserEmail());
-		record.setVendUserName(shipRecord.getVendUserName());
-		record.setVendUserTel(shipRecord.getVendUserTel());
-		try {
-			AccountUtils.synchronizeRecord(record);
-			vendor.setSynchStatus(Constant.YES);
-			vendorDao.save(vendor);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
 	/**
 	 * 增加供应商关系
 	 * 

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

@@ -1,12 +1,11 @@
 package com.uas.platform.b2b.erp.service.impl;
 
-import com.uas.account.util.AccountUtils;
 import com.uas.platform.b2b.dao.*;
 import com.uas.platform.b2b.erp.model.PurchaseForecast;
 import com.uas.platform.b2b.erp.service.PurchaseForecastService;
+import com.uas.platform.b2b.erp.service.VendorService;
 import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.support.SystemSession;
-import com.uas.platform.b2b.temporary.model.PartnershipRecord;
 import com.uas.platform.core.model.Constant;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -30,6 +29,14 @@ public class PurchaseForecastServiceImpl implements PurchaseForecastService {
 	@Autowired
 	private PurchaseForecastAllDao purchaseForecastDao;
 
+	@Autowired
+	private VendorService vendorService;
+
+    /**
+     * 应用来源
+     */
+    private final String APPID = "uas";
+
 	@Override
 	public List<PurchaseForecastAllItem> convertPurchaseForecast(List<PurchaseForecast> purchaseForecasts) {
 		List<PurchaseForecastAllItem> items = new ArrayList<PurchaseForecastAllItem>();
@@ -59,7 +66,7 @@ public class PurchaseForecastServiceImpl implements PurchaseForecastService {
 							if (vendors.size() == 0) {
 								vendor = addVendor(item);
 								if (null != vendor) {
-									addPartnerShipRecord(vendor); // 添加合作伙伴关系
+									vendorService.addPartnerShipRecord(vendor, APPID); // 添加合作伙伴关系
 								}
 							} else {
 								vendor = vendors.get(0);
@@ -93,31 +100,6 @@ public class PurchaseForecastServiceImpl implements PurchaseForecastService {
 		return items;
 	}
 
-	private void addPartnerShipRecord(Vendor vendor) {
-		PartnershipRecord shipRecord = new PartnershipRecord("uas", vendor);
-		com.uas.account.entity.PartnershipRecord record = new com.uas.account.entity.PartnershipRecord();
-		record.setAppId(shipRecord.getAppId());
-		record.setCustName(shipRecord.getCustName());
-		record.setCustUID(shipRecord.getCustUID());
-		record.setCustUserCode(shipRecord.getCustUserCode());
-		record.setCustUserEmail(shipRecord.getCustUserEmail());
-		record.setCustUserName(shipRecord.getCustUserName());
-		record.setCustUserTel(shipRecord.getCustUserTel());
-		record.setVendName(shipRecord.getVendName());
-		record.setVendUID(shipRecord.getVendUID());
-		record.setVendUserCode(shipRecord.getVendUserCode());
-		record.setVendUserEmail(shipRecord.getVendUserEmail());
-		record.setVendUserName(shipRecord.getVendUserName());
-		record.setVendUserTel(shipRecord.getVendUserTel());
-		try {
-			AccountUtils.synchronizeRecord(record);
-			vendor.setSynchStatus(Constant.YES);
-			vendorDao.save(vendor);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
 	@Override
 	public List<PurchaseForecastAllItem> convertEDIPurchaseForecast(List<PurchaseForecast> purchaseForecasts, Long enUU) {
 		List<PurchaseForecastAllItem> items = new ArrayList<PurchaseForecastAllItem>();
@@ -146,7 +128,7 @@ public class PurchaseForecastServiceImpl implements PurchaseForecastService {
 							if (vendors.size() == 0) {
 								vendor = addVendor(item);
 								if (null != vendor) {
-									addPartnerShipRecord(vendor);
+                                    vendorService.addPartnerShipRecord(vendor, APPID); // 添加合作伙伴关系
 								}
 							} else {
 								vendor = vendors.get(0);
@@ -183,7 +165,7 @@ public class PurchaseForecastServiceImpl implements PurchaseForecastService {
 	/**
 	 * 添加供应商资料
 	 * 
-	 * @param forecast
+	 * @param forecastItem
 	 */
 	private Vendor addVendor(PurchaseForecastAllItem forecastItem) {
 		Enterprise enterprise = enterpriseDao.findOne(forecastItem.getVendUU());

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

@@ -1,13 +1,12 @@
 package com.uas.platform.b2b.erp.service.impl;
 
-import com.uas.account.util.AccountUtils;
 import com.uas.platform.b2b.dao.*;
 import com.uas.platform.b2b.erp.model.ProductSample;
 import com.uas.platform.b2b.erp.model.ProductSampleApproval;
 import com.uas.platform.b2b.erp.service.PurchaseSampleService;
+import com.uas.platform.b2b.erp.service.VendorService;
 import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.support.SystemSession;
-import com.uas.platform.b2b.temporary.model.PartnershipRecord;
 import com.uas.platform.core.model.Constant;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,9 +34,13 @@ public class PurchaseSampleServiceImpl implements PurchaseSampleService {
 	@Autowired
 	private VendorDao vendorDao;
 
+	@Autowired
+	private VendorService vendorService;
+
 	@Override
 	public List<PurchaseProofingItem> convertProofing(List<ProductSample> samples) {
 		List<PurchaseProofingItem> proofingItems = new ArrayList<PurchaseProofingItem>();
+		final String appId = "uas";// 应用来源
 		long enUU = SystemSession.getUser().getEnterprise().getUu();
 		for (ProductSample sample : samples) {
 			List<PurchaseProofing> proofingList = purchaseProofingDao.findByEnUUAndCode(enUU, sample.getPs_code());
@@ -66,7 +69,7 @@ public class PurchaseSampleServiceImpl implements PurchaseSampleService {
 						if (vendors.size() == 0) {// 供应商列表中不存在供应商关系
 							vendor = addVendor(proofingItem);// 增加供应商关系
 							if (null != vendor) {
-								addPartnerShipRecord(vendor);
+								vendorService.addPartnerShipRecord(vendor, appId);
 							}
 						} else {
 							vendor = vendors.get(0);
@@ -91,31 +94,6 @@ public class PurchaseSampleServiceImpl implements PurchaseSampleService {
 		return proofingItems;
 	}
 
-	private void addPartnerShipRecord(Vendor vendor) {
-		PartnershipRecord shipRecord = new PartnershipRecord("uas", vendor);
-		com.uas.account.entity.PartnershipRecord record = new com.uas.account.entity.PartnershipRecord();
-		record.setAppId(shipRecord.getAppId());
-		record.setCustName(shipRecord.getCustName());
-		record.setCustUID(shipRecord.getCustUID());
-		record.setCustUserCode(shipRecord.getCustUserCode());
-		record.setCustUserEmail(shipRecord.getCustUserEmail());
-		record.setCustUserName(shipRecord.getCustUserName());
-		record.setCustUserTel(shipRecord.getCustUserTel());
-		record.setVendName(shipRecord.getVendName());
-		record.setVendUID(shipRecord.getVendUID());
-		record.setVendUserCode(shipRecord.getVendUserCode());
-		record.setVendUserEmail(shipRecord.getVendUserEmail());
-		record.setVendUserName(shipRecord.getVendUserName());
-		record.setVendUserTel(shipRecord.getVendUserTel());
-		try {
-			AccountUtils.synchronizeRecord(record);
-			vendor.setSynchStatus(Constant.YES);
-			vendorDao.save(vendor);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
 	/**
 	 * 添加供应商资料
 	 * 

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

@@ -8,6 +8,7 @@ import com.uas.platform.b2b.erp.model.Purchase;
 import com.uas.platform.b2b.erp.model.PurchaseDetailEnd;
 import com.uas.platform.b2b.erp.model.PurchaseReply;
 import com.uas.platform.b2b.erp.service.PurchaseService;
+import com.uas.platform.b2b.erp.service.VendorService;
 import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
@@ -48,11 +49,15 @@ public class PurchaseServiceImpl implements PurchaseService {
 	@Autowired
 	private UserOrderDao userOrderDao;
 
+	@Autowired
+	private VendorService vendorService;
+
 	private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
 
 	@Override
 	public List<PurcOrderInfoItem> convertPurchase(List<Purchase> purchases) {
 		List<PurcOrderInfoItem> orderItems = new ArrayList<PurcOrderInfoItem>();
+        final String appId = "uas";// 应用来源
 		long enUU = SystemSession.getUser().getEnterprise().getUu();
 		for (Purchase purchase : purchases) {
 			// 先查看是否已存在
@@ -65,7 +70,7 @@ public class PurchaseServiceImpl implements PurchaseService {
 				if (vendors.size() == 0) {// 供应商资料在平台上不存在
 					vendor = addVendor(order);// 添加企业的供应商资料
 					if (null != vendor) {
-						addPartnerShipRecord(vendor);// 添加企业圈合作伙伴关系
+						vendorService.addPartnerShipRecord(vendor, appId);// 添加企业圈合作伙伴关系
 					}
 				} else {// 供应商资料在平台上存在
 					vendor = vendors.get(0);
@@ -106,31 +111,6 @@ public class PurchaseServiceImpl implements PurchaseService {
 		return orderItems;
 	}
 
-	private void addPartnerShipRecord(Vendor vendor) {
-		PartnershipRecord shipRecord = new PartnershipRecord("uas", vendor);
-		com.uas.account.entity.PartnershipRecord record = new com.uas.account.entity.PartnershipRecord();
-		record.setAppId(shipRecord.getAppId());
-		record.setCustName(shipRecord.getCustName());
-		record.setCustUID(shipRecord.getCustUID());
-		record.setCustUserCode(shipRecord.getCustUserCode());
-		record.setCustUserEmail(shipRecord.getCustUserEmail());
-		record.setCustUserName(shipRecord.getCustUserName());
-		record.setCustUserTel(shipRecord.getCustUserTel());
-		record.setVendName(shipRecord.getVendName());
-		record.setVendUID(shipRecord.getVendUID());
-		record.setVendUserCode(shipRecord.getVendUserCode());
-		record.setVendUserEmail(shipRecord.getVendUserEmail());
-		record.setVendUserName(shipRecord.getVendUserName());
-		record.setVendUserTel(shipRecord.getVendUserTel());
-		try {
-			AccountUtils.synchronizeRecord(record);
-			vendor.setSynchStatus(Constant.YES);
-			vendorDao.save(vendor);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
 	@Override
 	public List<PurchaseReply> convertPurchaseOrderReply(List<PurchaseOrderReply> orderReplies) {
 		List<PurchaseReply> replies = new ArrayList<PurchaseReply>();

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

@@ -1,13 +1,12 @@
 package com.uas.platform.b2b.erp.service.impl;
 
-import com.uas.account.util.AccountUtils;
 import com.uas.platform.b2b.dao.*;
 import com.uas.platform.b2b.erp.model.Quotation;
 import com.uas.platform.b2b.erp.model.QuotationDecide;
 import com.uas.platform.b2b.erp.service.QuotationService;
+import com.uas.platform.b2b.erp.service.VendorService;
 import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.support.SystemSession;
-import com.uas.platform.b2b.temporary.model.PartnershipRecord;
 import com.uas.platform.core.model.Constant;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,12 +32,16 @@ public class QuotationServiceImpl implements QuotationService {
 	@Autowired
 	private UserDao userDao;
 
+	@Autowired
+	private VendorService vendorService;
+
 	@Override
 	public Map<String, List<SaleQuotationItem>> convertQuotation(List<Quotation> quotations) {
 		Map<String, List<SaleQuotationItem>> mapSaleQuotationItem = new HashMap<String, List<SaleQuotationItem>>();
 		List<SaleQuotationItem> saveItems = new ArrayList<SaleQuotationItem>();
 		List<SaleQuotationItem> resItems = new ArrayList<SaleQuotationItem>();
 		long enUU = SystemSession.getUser().getEnterprise().getUu();
+        final String appId = "uas";// 应用来源
 		for (Quotation quotation : quotations) {
 			// 先查看是否已存在
 			List<SaleQuotation> quotations2 = saleQuotationDao.findByEnUUAndCode(enUU, quotation.getQu_code());
@@ -71,7 +74,7 @@ public class QuotationServiceImpl implements QuotationService {
 				} else {// 不存在对应的供应商资料，增加供应商关系
 					vendor = addVendor(saleQuotation);
 					if (null != vendor) {
-						addPartnerShipRecord(vendor); // 添加供应商关系同时增加合作伙伴关系记录
+                        vendorService.addPartnerShipRecord(vendor, appId); // 添加供应商关系同时增加合作伙伴关系记录
 					}
 				}
 				if (vendor != null && vendor.getMyEnUU() != null) {
@@ -109,31 +112,6 @@ public class QuotationServiceImpl implements QuotationService {
 		return mapSaleQuotationItem;
 	}
 
-	private void addPartnerShipRecord(Vendor vendor) {
-		PartnershipRecord shipRecord = new PartnershipRecord("uas", vendor);
-		com.uas.account.entity.PartnershipRecord record = new com.uas.account.entity.PartnershipRecord();
-		record.setAppId(shipRecord.getAppId());
-		record.setCustName(shipRecord.getCustName());
-		record.setCustUID(shipRecord.getCustUID());
-		record.setCustUserCode(shipRecord.getCustUserCode());
-		record.setCustUserEmail(shipRecord.getCustUserEmail());
-		record.setCustUserName(shipRecord.getCustUserName());
-		record.setCustUserTel(shipRecord.getCustUserTel());
-		record.setVendName(shipRecord.getVendName());
-		record.setVendUID(shipRecord.getVendUID());
-		record.setVendUserCode(shipRecord.getVendUserCode());
-		record.setVendUserEmail(shipRecord.getVendUserEmail());
-		record.setVendUserName(shipRecord.getVendUserName());
-		record.setVendUserTel(shipRecord.getVendUserTel());
-		try {
-			AccountUtils.synchronizeRecord(record);
-			vendor.setSynchStatus(Constant.YES);
-			vendorDao.save(vendor);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
 	@Override
 	public List<QuotationDecide> convertQuotationDecide(List<SaleQuotationItem> quotationItems) {
 		List<QuotationDecide> decides = new ArrayList<QuotationDecide>();

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

@@ -7,6 +7,7 @@ import com.uas.platform.b2b.dao.*;
 import com.uas.platform.b2b.erp.model.B2BVendor;
 import com.uas.platform.b2b.erp.model.SaleTenderErp;
 import com.uas.platform.b2b.erp.service.TenderService;
+import com.uas.platform.b2b.erp.service.VendorService;
 import com.uas.platform.b2b.event.PurchaseTenderDecideReleaseEvent;
 import com.uas.platform.b2b.event.PurchaseTenderSaveReleaseEvent;
 import com.uas.platform.b2b.model.*;
@@ -97,6 +98,9 @@ public class TenderServiceImpl implements TenderService {
     @Autowired
     private SaleTenderQuestionDao saleTenderQuestionDao;
 
+    @Autowired
+    private VendorService vendorService;
+
     /**
      * 短信接口
      */
@@ -723,6 +727,7 @@ public class TenderServiceImpl implements TenderService {
      */
     private void addSaleTender(PurchaseTender tender, List<TenderContactInfo> contactInfos, PurchaseTenderProd tenderProd) {
         List<SaleTender> eventList = new ArrayList<>();
+        final String appId = "uas";// 应用来源
         if (!CollectionUtils.isEmpty(contactInfos)) {
             List<SaleTenderItem> saleTenderItems = new ArrayList<>();
             for (TenderContactInfo contactInfo : contactInfos) {
@@ -757,7 +762,7 @@ public class TenderServiceImpl implements TenderService {
                                 if (vendors.size() == 0) {// 供应商列表中不存在供应商关系
                                     vendor = addVendor(saleTender);// 增加供应商关系
                                     if (null != vendor) {
-                                        addPartnerShipRecord(vendor);
+                                        vendorService.addPartnerShipRecord(vendor, appId);
                                     }
                                 } else {
                                     vendor = vendors.get(0);
@@ -885,35 +890,6 @@ public class TenderServiceImpl implements TenderService {
         return null;
     }
 
-    /**
-     * 添加合作伙伴关系
-     * @param vendor
-     */
-    private void addPartnerShipRecord(Vendor vendor) {
-        PartnershipRecord shipRecord = new PartnershipRecord("uas", vendor);
-        com.uas.account.entity.PartnershipRecord record = new com.uas.account.entity.PartnershipRecord();
-        record.setAppId(shipRecord.getAppId());
-        record.setCustName(shipRecord.getCustName());
-        record.setCustUID(shipRecord.getCustUID());
-        record.setCustUserCode(shipRecord.getCustUserCode());
-        record.setCustUserEmail(shipRecord.getCustUserEmail());
-        record.setCustUserName(shipRecord.getCustUserName());
-        record.setCustUserTel(shipRecord.getCustUserTel());
-        record.setVendName(shipRecord.getVendName());
-        record.setVendUID(shipRecord.getVendUID());
-        record.setVendUserCode(shipRecord.getVendUserCode());
-        record.setVendUserEmail(shipRecord.getVendUserEmail());
-        record.setVendUserName(shipRecord.getVendUserName());
-        record.setVendUserTel(shipRecord.getVendUserTel());
-        try {
-            AccountUtils.synchronizeRecord(record);
-            vendor.setSynchStatus(Constant.YES);
-            vendorDao.save(vendor);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
     /**
      * 删除产品明细
      *

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

@@ -15,8 +15,10 @@ import com.uas.platform.b2b.model.Vendor;
 import com.uas.platform.b2b.support.MessageConf;
 import com.uas.platform.b2b.support.SysConf;
 import com.uas.platform.b2b.support.SystemSession;
+import com.uas.platform.b2b.temporary.model.PartnershipRecord;
 import com.uas.platform.b2b.temporary.model.SmsMessage;
 import com.uas.platform.core.logging.BufferedLoggerManager;
+import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.util.HttpUtil;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
@@ -209,4 +211,36 @@ public class VendorServiceImpl implements VendorService{
         String sql = "update purc$vendors set ve_erpstatus = 203 where ve_id in (" + ids +")";
         commonDao.getJdbcTemplate().update(sql);
     }
+
+    /**
+     * 添加合作伙伴
+     *
+     * @param vendor 供应商资料
+     * @param appId  应用来源
+     */
+    @Override
+    public void addPartnerShipRecord(Vendor vendor, String appId) {
+        PartnershipRecord shipRecord = new PartnershipRecord(appId, vendor);
+        com.uas.account.entity.PartnershipRecord record = new com.uas.account.entity.PartnershipRecord();
+        record.setAppId(shipRecord.getAppId());
+        record.setCustName(shipRecord.getCustName());
+        record.setCustUID(shipRecord.getCustUID());
+        record.setCustUserCode(shipRecord.getCustUserCode());
+        record.setCustUserEmail(shipRecord.getCustUserEmail());
+        record.setCustUserName(shipRecord.getCustUserName());
+        record.setCustUserTel(shipRecord.getCustUserTel());
+        record.setVendName(shipRecord.getVendName());
+        record.setVendUID(shipRecord.getVendUID());
+        record.setVendUserCode(shipRecord.getVendUserCode());
+        record.setVendUserEmail(shipRecord.getVendUserEmail());
+        record.setVendUserName(shipRecord.getVendUserName());
+        record.setVendUserTel(shipRecord.getVendUserTel());
+        try {
+            AccountUtils.synchronizeRecord(record);
+            vendor.setSynchStatus(Constant.YES);
+            vendorDao.save(vendor);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }

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

@@ -68,6 +68,14 @@ public class VendorsServiceImpl implements VendorService {
 	@Autowired
 	private UserDao userDao;
 
+	@Autowired
+	private com.uas.platform.b2b.erp.service.VendorService vendorService;
+
+    /**
+     * 应用来源
+     */
+    private final String APPID = "uas";
+
 	@Override
 	public List<Vendor> findMyVendors() {
 		return vendorDao.findByMyEnUU(SystemSession.getUser().getEnterprise().getUu());
@@ -85,35 +93,10 @@ public class VendorsServiceImpl implements VendorService {
 		vendor.setCustswitch(Constant.YES);
 		vendor.setVendswitch(Constant.YES);
 		Vendor vendor1 = vendorDao.save(vendor);
-		addPartnerShipRecord(vendor1); // 添加合作伙伴关系
+		vendorService.addPartnerShipRecord(vendor1, APPID); // 添加合作伙伴关系
 		return vendor1;
 	}
 
-	private void addPartnerShipRecord(Vendor vendor) {
-		PartnershipRecord shipRecord = new PartnershipRecord("uas", vendor);
-		com.uas.account.entity.PartnershipRecord record = new com.uas.account.entity.PartnershipRecord();
-		record.setAppId(shipRecord.getAppId());
-		record.setCustName(shipRecord.getCustName());
-		record.setCustUID(shipRecord.getCustUID());
-		record.setCustUserCode(shipRecord.getCustUserCode());
-		record.setCustUserEmail(shipRecord.getCustUserEmail());
-		record.setCustUserName(shipRecord.getCustUserName());
-		record.setCustUserTel(shipRecord.getCustUserTel());
-		record.setVendName(shipRecord.getVendName());
-		record.setVendUID(shipRecord.getVendUID());
-		record.setVendUserCode(shipRecord.getVendUserCode());
-		record.setVendUserEmail(shipRecord.getVendUserEmail());
-		record.setVendUserName(shipRecord.getVendUserName());
-		record.setVendUserTel(shipRecord.getVendUserTel());
-		try {
-			String result = AccountUtils.synchronizeRecord(record);
-			vendor.setSynchStatus(Constant.YES);
-			vendorDao.save(vendor);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
 	@Override
 	public List<Vendor> addVendors(List<Vendor> vendors) {
 		List<Vendor> validVendors = new ArrayList<Vendor>();
@@ -121,7 +104,7 @@ public class VendorsServiceImpl implements VendorService {
 			Vendor vend = addVendor(vendor);
 			if (vend != null) {
 				validVendors.add(vend);
-				addPartnerShipRecord(vend); // 添加合作伙伴关系
+                vendorService.addPartnerShipRecord(vend, APPID); // 添加合作伙伴关系
 			}
 		}
 		return validVendors;
@@ -310,7 +293,7 @@ public class VendorsServiceImpl implements VendorService {
 		int i = 0;
 		for (Vendor vendor : vendors) {
 			i++;
-			addPartnerShipRecord(vendor);
+            vendorService.addPartnerShipRecord(vendor, APPID);
 		}
 	}