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

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

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.uas.platform.b2b.erp.model.Inquiry;
+import com.uas.platform.b2b.erp.model.InquiryDetailDet;
 import com.uas.platform.b2b.erp.service.InquiryService;
 import com.uas.platform.b2b.service.PurchaseInquiryService;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
@@ -48,6 +49,15 @@ public class InquiryController {
 		purchaseInquiryService.save(inquiryService.convertInquiry(inquiries));
 	}
 	
-	
+	/**
+	 * 买家ERP获取平台的报价信息
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "/reply", method = RequestMethod.GET)
+	@ResponseBody
+	public List<InquiryDetailDet> getReply() {
+		return inquiryService.convertPurchaseInquiryReply(purchaseInquiryService.findNotUploadReply());
+	}
 
 }

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

@@ -3,6 +3,7 @@ package com.uas.platform.b2b.erp.service;
 import java.util.List;
 
 import com.uas.platform.b2b.erp.model.Inquiry;
+import com.uas.platform.b2b.erp.model.InquiryDetailDet;
 import com.uas.platform.b2b.model.PurchaseInquiryReply;
 
 public interface InquiryService {
@@ -15,4 +16,12 @@ public interface InquiryService {
 	 */
 	List<PurchaseInquiryReply> convertInquiry(List<Inquiry> inquiries);
 
+	/**
+	 * 将平台的报价信息，转为买家ERP的报价信息
+	 * 
+	 * @param inquiryReplies
+	 * @return
+	 */
+	List<InquiryDetailDet> convertPurchaseInquiryReply(List<PurchaseInquiryReply> inquiryReplies);
+
 }

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

@@ -10,6 +10,7 @@ import org.springframework.stereotype.Service;
 import com.uas.platform.b2b.dao.ProductDao;
 import com.uas.platform.b2b.dao.PurchaseInquiryDao;
 import com.uas.platform.b2b.erp.model.Inquiry;
+import com.uas.platform.b2b.erp.model.InquiryDetailDet;
 import com.uas.platform.b2b.erp.service.InquiryService;
 import com.uas.platform.b2b.model.Product;
 import com.uas.platform.b2b.model.PurchaseInquiry;
@@ -58,4 +59,14 @@ public class InquiryServiceImpl implements InquiryService {
 		return inquiryReplies;
 	}
 
+	@Override
+	public List<InquiryDetailDet> convertPurchaseInquiryReply(List<PurchaseInquiryReply> inquiryReplies) {
+		List<InquiryDetailDet> dets = new ArrayList<InquiryDetailDet>();
+		if (!CollectionUtils.isEmpty(inquiryReplies)) {
+			for (PurchaseInquiryReply reply : inquiryReplies)
+				dets.add(new InquiryDetailDet(reply));
+		}
+		return dets;
+	}
+
 }

src/main/java/com/uas/platform/b2b/service/PurchaseInquiryService.java

@@ -15,4 +15,11 @@ public interface PurchaseInquiryService {
 	 */
 	public void save(List<PurchaseInquiryReply> inquiryReplies);
 
+	/**
+	 * 查找所有待上传到买家ERP的报价信息
+	 * 
+	 * @return
+	 */
+	List<PurchaseInquiryReply> findNotUploadReply();
+
 }

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

@@ -42,4 +42,10 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 		}
 	}
 
+	@Override
+	public List<PurchaseInquiryReply> findNotUploadReply() {
+		
+		return null;
+	}
+
 }