Browse Source

增加报价传入信息打印

hejq 7 years ago
parent
commit
0ee88d054b

+ 5 - 0
src/main/java/com/uas/platform/b2b/controller/SaleInquiryController.java

@@ -31,6 +31,7 @@ import com.uas.search.b2b.model.SPage;
 import com.uas.search.b2b.model.Sort;
 import com.uas.search.b2b.model.Sort.Type;
 import com.uas.search.b2b.util.SearchConstants;
+import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -82,6 +83,8 @@ public class SaleInquiryController {
 
 	private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
 
+	private final static Logger LOGGER_INFO = Logger.getLogger(SaleInquiryController.class);
+
 	/**
 	 * 询价种类
 	 */
@@ -592,6 +595,7 @@ public class SaleInquiryController {
 	public ResponseEntity<String> replyInquiryItem(@RequestBody String json,
 			@PathVariable("inquiryItemId") Long inquiryItemId, String token) {
 		PurchaseInquiryItem item = FlexJsonUtils.fromJson(json, PurchaseInquiryItem.class);
+        LOGGER_INFO.info(item.getReplies());
 		if (item.getReplies().size() == 1) {
             item.getReplies().forEach(reply -> {
                if (null != reply.getLapQty() && reply.getLapQty() > 0) {
@@ -621,6 +625,7 @@ public class SaleInquiryController {
 	public ResponseEntity<String> saveInquiryItem(@RequestBody String json,
 			@PathVariable("inquiryItemId") Long inquiryItemId, String token) {
 		PurchaseInquiryItem item = FlexJsonUtils.fromJson(json, PurchaseInquiryItem.class);
+        LOGGER_INFO.info(item.getReplies());
         if (item.getReplies().size() == 1) {
             item.getReplies().forEach(reply -> {
                 if (null != reply.getLapQty() && reply.getLapQty() > 0) {

+ 12 - 0
src/main/java/com/uas/platform/b2b/mobile/controller/AppInquiryController.java

@@ -10,6 +10,7 @@ import com.uas.platform.b2b.service.PurchaseInquiryService;
 import com.uas.platform.b2b.service.UserService;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
+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;
@@ -22,6 +23,7 @@ import com.uas.search.b2b.model.Sort;
 import com.uas.search.b2b.util.SearchConstants;
 import com.uas.sso.support.Page;
 import org.apache.axis.utils.StringUtils;
+import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -59,6 +61,8 @@ public class AppInquiryController {
 
     private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
 
+    private final static Logger LOGGER_INFO = Logger.getLogger(AppInquiryController.class);
+
     /**
      * 作为卖家,收到的采购询价(全部)- 搜索
      *
@@ -490,6 +494,14 @@ public class AppInquiryController {
     @RequestMapping(value = "/items/{inquiryItemId}/reply", method = RequestMethod.POST)
     public ResponseEntity<String> replyInquiryItem(@PathVariable("inquiryItemId") Long inquiryItemId, String replies, Long leadtime, Double minPackQty, Double minOrderQty) {
         PurchaseInquiryItem item = toItem(inquiryItemId, replies, leadtime, minOrderQty, minPackQty);
+        LOGGER_INFO.info(item.getReplies());
+        if (item.getReplies().size() == 1) {
+            item.getReplies().forEach(reply -> {
+                if (null != reply.getLapQty() && reply.getLapQty() > 0) {
+                    throw new IllegalOperatorException("报价分段数量格式不正确,请从0开始报价");
+                }
+            });
+        }
         item = purchaseInquiryService.reply(item);
         logger.log("客户询价单", "给单个客户询价明细填写价格并确认报价", item.replyDescription(), item.getInquiry().getCode(), inquiryItemId);
         return new ResponseEntity<String>(HttpStatus.OK);

+ 9 - 3
src/main/java/com/uas/platform/b2b/model/PurchaseInquiryReply.java

@@ -1,14 +1,12 @@
 package com.uas.platform.b2b.model;
 
-import java.io.Serializable;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
+import java.io.*;
 
 /**
  * 采购询价单明细的报价记录
@@ -66,4 +64,12 @@ public class PurchaseInquiryReply implements Serializable {
 		this.price = price;
 	}
 
+    @Override
+    public String toString() {
+        return "PurchaseInquiryReply{" +
+            "id=" + id +
+            ", lapQty=" + lapQty +
+            ", price=" + price +
+            '}';
+    }
 }