Merge branch 'master' into test6.8.5

Conflicts:
	dal/src/main/java/com/yoho/order/model/BuyerOrderReq.java

@@ -3,14 +3,19 @@ package com.yoho.order.model;
 import java.util.List;
 
 import com.yoho.ufo.service.model.PageRequestBO;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import lombok.ToString;
+import lombok.experimental.Builder;
 
 /**
  * Created by caoyan.
  */
 @Data
-@ToString
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class BuyerOrderReq extends PageRequestBO{
 
     /**
@@ -79,5 +84,4 @@ public class BuyerOrderReq extends PageRequestBO{
 	private String platformExpressInfoFlag;
 	
 	private String queryStr;
-
 }

@@ -445,7 +445,9 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
     	if(null == buyerOrder) {
     		return null;
     	}
-    	
+
+		LOGGER.info("method updateOrderStatus in, buyerOrderMapper.selectById result is {}", buyerOrder);
+
     	//调用前台接口
     	String args = "";
     	JSONObject jsonObject = new JSONObject();