更新公共询价保存方式

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

@@ -41,6 +41,7 @@ import com.uas.platform.b2b.model.Role;
 import com.uas.platform.b2b.model.User;
 import com.uas.platform.b2b.model.UserOrders;
 import com.uas.platform.b2b.model.Vendor;
+import com.uas.platform.b2b.ps.InquiryUtils;
 import com.uas.platform.b2b.ps.ProductUtils;
 import com.uas.platform.b2b.service.AttachService;
 import com.uas.platform.b2b.service.PurcInquiryService;
@@ -52,6 +53,7 @@ import com.uas.platform.b2b.temporary.model.InquiryProductInfo;
 import com.uas.platform.b2b.temporary.model.PurcInquiryInfo;
 import com.uas.platform.b2b.temporary.model.PurcInquiryProductInfo;
 import com.uas.platform.b2b.temporary.model.VendorAndContact;
+import com.uas.platform.core.exception.IllegalOperatorException;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.PageInfo;
@@ -544,7 +546,6 @@ public class PurcInquiryServiceImpl implements PurcInquiryService {
 				inquiry.setEnterprise(enterpriseDao.findEnterpriseInfoByUu(enuu));
 				inquiry.setRecorder(SystemSession.getUser().getUserName());
 				inquiry.setRecorderUU(SystemSession.getUser().getUserUU());
-				inquiry.setEnteryStatus(Status.UNAPPLY.value());
 				inquiry.setPriceType(inquiryInfo.getPriceType());
 				inquiry.setIsOpen((short) inquiryInfo.getIsOpen());
 				inquiry.setInvoice(inquiryInfo.getInvoice());
@@ -552,6 +553,7 @@ public class PurcInquiryServiceImpl implements PurcInquiryService {
 				inquiry.setCurrency(inquiryInfo.getCurrency());
 				inquiry.setIfTax(inquiryInfo.getIfTax());
 				inquiry.setInquirytype(inquiryInfo.getInquirytype());
+                inquiry.setEnteryStatus(Status.ENABLED.value());
 				Set<PurcInquiryItem> items = new HashSet<PurcInquiryItem>();
 				Short i = 1;
 				if (!CollectionUtils.isEmpty(inquiryInfo.getInquiryItems())) {
@@ -580,20 +582,16 @@ public class PurcInquiryServiceImpl implements PurcInquiryService {
 								product.setCmpUuId(purcitem.getProdCode());
 								product.setUnit(purcitem.getUnit());
 								product.setUserUU(SystemSession.getUser().getUserUU());
-//								product.setShipAddr(SystemSession.getUser().getEnterprise().getEnAddress());
 								product.setSpec(purcitem.getProdTitle());
-								// TODO 因为这里要求数据即存即用，从公共库同步过来可能会有延迟，暂时两边都存；之后要修改为只调用公共服务方法
 								Long proId = ProductUtils.updateOne(product);
 								product = productDao.findOne(proId);
-								System.out.println(JSON.toJSON(product));
 								if (null != product) {
 									item.setProductId(proId);
 								} else {
-
+                                    throw new IllegalOperatorException("物料保存失败:" + product.getTitle());
 								}
 							}
 						}
-						item.setInquiry(inquiry);
 						item.setNumber(i);
 						item.setCurrency(inquiry.getCurrency());
 						item.setFromDate(new Date());
@@ -612,10 +610,11 @@ public class PurcInquiryServiceImpl implements PurcInquiryService {
 						i++;
 					}
 				}
-				List<PurcInquiryItem> purcitems = purcInquiryItemDao.save(items);
-				if (purcitems.get(0).getId() != null) {
+				inquiry.setInquiryItems(items);
+                inquiry = InquiryUtils.saveInquiry(inquiry);
+				if (inquiry.getId() != null) {
 					map.put("success", "询价单保存成功");
-					map.put("id", purcitems.get(0).getInquiry().getId());
+					map.put("id", inquiry.getId());
 					logger.log("询价单", "平台新增询价单", useruu, SystemSession.getUser().getIp());
 				} else {
 					map.put("error", "询价单保存失败");
@@ -631,10 +630,6 @@ public class PurcInquiryServiceImpl implements PurcInquiryService {
 		// 先进行保存
 		Object inquiryId = saveWithoutVendor(inquiryInfo, uploadItem).get("id");// 取出id进行更新状态
 		if (inquiryId != null) {
-			logger.log("询价单", "平台发布公共询价单", SystemSession.getUser().getUserUU(), SystemSession.getUser().getIp());
-			PurcInquiry inquiry = inquiryDao.findOne(Long.valueOf(inquiryId.toString()));
-			inquiry.setEnteryStatus(Status.ENABLED.value());
-			inquiryDao.save(inquiry);
 			map.put("success", "询价单发布成功");
 		} else {
 			map.put("error", "询价单发布失败");