Merge remote-tracking branch 'origin/master' into hotfix-jdk8-wangmh

src/main/java/com/uas/platform/b2b/erp/model/SaleDown.java

@@ -33,6 +33,15 @@ public class SaleDown {
 	private String sa_receivename;
 	private String sa_receivecode;
 	private List<SaleDownDetail> saleDownDetails;
+	private String sa_remark;
+
+	public String getSa_remark() {
+		return sa_remark;
+	}
+
+	public void setSa_remark(String sa_remark) {
+		this.sa_remark = sa_remark;
+	}
 
 	public long getB2b_pu_id() {
 		return b2b_pu_id;
@@ -205,6 +214,7 @@ public class SaleDown {
 		this.sa_receivecode = order.getReceiveCode();
 		this.sa_receivename = order.getReceiveName();
 		this.sa_payments = order.getPayments();
+		this.sa_remark = order.getRemark();
 		if (!CollectionUtils.isEmpty(order.getOrderItems())) {
 			List<SaleDownDetail> details = new ArrayList<SaleDownDetail>();
 			for (PurchaseOrderAllItem item : order.getOrderItems()) {
@@ -229,6 +239,7 @@ public class SaleDown {
 		this.sa_shipby = order.getShipAddress();
 		this.sa_recorddate = new Date();
 		this.sa_payments = order.getPayments();
+		this.sa_remark = order.getRemark();
 		List<SaleDownDetail> details = new ArrayList<SaleDownDetail>();
 		SaleDownDetail detail = new SaleDownDetail(order);
 		details.add(detail);

src/main/java/com/uas/platform/b2b/erp/model/SaleDownDetail.java

@@ -25,7 +25,15 @@ public class SaleDownDetail {
 	private Double sd_taxtotal;
 	private String sd_factory;
 	private String sd_prodsource;
-	
+	private String sd_remark;
+
+	public String getSd_remark() {
+		return sd_remark;
+	}
+
+	public void setSd_remark(String sd_remark) {
+		this.sd_remark = sd_remark;
+	}
 
 	public String getSd_factory() {
 		return sd_factory;
@@ -199,6 +207,7 @@ public class SaleDownDetail {
 		this.sd_taxtotal = orderItem.getNoTaxAmount();
 		this.sd_factory = orderItem.getFactory();
 		this.sd_prodsource = orderItem.getProdsource();
+		this.sd_remark = orderItem.getRemark();
 	}
 
 	/**
@@ -223,6 +232,7 @@ public class SaleDownDetail {
 		this.sd_replydetail = order.getReplyRemark();
 		this.sd_replyqty = order.getReplyQty();
 		this.sd_factory = order.getFactory();
+		this.sd_remark = order.getRemark();
 	}
 
 }

src/main/java/com/uas/platform/b2b/listener/GlobalExceptionHandler.java

@@ -13,6 +13,9 @@ import com.uas.platform.core.util.AgentUtils;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import org.apache.http.protocol.HTTP;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.ControllerAdvice;
@@ -71,7 +74,7 @@ public class GlobalExceptionHandler {
      */
     @ResponseBody
     @ExceptionHandler(value = Exception.class)
-    public HttpServletResponse defaultErrorHandler(HttpServletRequest request, Exception e, HttpServletResponse response) throws UnsupportedEncodingException {
+    public ResponseEntity<String> defaultErrorHandler(HttpServletRequest request, Exception e, HttpServletResponse response) throws UnsupportedEncodingException {
         String jsonStr = JSON.toJSONString(e.getStackTrace());
         List<ExceptionMsg> msgList = FlexJsonUtils.fromJsonArray(jsonStr, ExceptionMsg.class);
         List<ExceptionMsg> msgs = new ArrayList<>();
@@ -91,6 +94,8 @@ public class GlobalExceptionHandler {
         if (!StringUtils.isEmpty(log.getId())) {
             detailDao.save(new ErrorLogDetail(log.getId(), AgentUtils.getIp(request), needRead, StringUtils.isEmpty(data) ? "" : URLDecoder.decode(data, HTTP.UTF_8), access));
         }
-        return response;
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("Content-Type", "application/text; charset=utf-8");
+        return new ResponseEntity(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
     }
 }