Merge branch 'test6.8.4' of http://git.yoho.cn/ufo/ufo-platform into test6.8.4

@@ -15,7 +15,7 @@ public class ExpressInfo implements Serializable {
     
     private Integer uid;
     
-    private String orderCode;
+    private Long orderCode;
     
     private String waybillCode;//运单号
     
@@ -50,11 +50,11 @@ public class ExpressInfo implements Serializable {
 		this.uid = uid;
 	}
 
-	public String getOrderCode() {
+	public Long getOrderCode() {
 		return orderCode;
 	}
 
-	public void setOrderCode(String orderCode) {
+	public void setOrderCode(Long orderCode) {
 		this.orderCode = orderCode;
 	}
 

@@ -645,6 +645,11 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
 		LOGGER.info("getExpressInfoListByStage orderCode is {}, expressTypeStr is {},records size is {} ,records is {}", orderCode, expressType , records.size(),JSON.toJSONString(records));
 
 		List<ExpressInfo> expressInfoList = expressInfoMapper.selectExpressInfoListByWaybillCodeAndLogisticsType(waybillCode,logisticsType);
+		//如果存在多笔订单的情况，选择一个最近的订单
+		if(CollectionUtils.isNotEmpty(expressInfoList)){
+			long latestOrder=expressInfoList.get(expressInfoList.size()-1).getOrderCode();
+			expressInfoList = expressInfoList.stream().filter(info->(latestOrder==info.getOrderCode())).collect(Collectors.toList());
+		}
 		return expressInfoList;
 	}