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

@@ -1449,6 +1449,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
 	    resp.setBuyerName(getUserNameByUid(buyerOrder.getUid()));
     	resp.setClientTypeStr(convertClientType(buyerOrder.getClientType()));
     	resp.setPayment(convertPayment(buyerOrder.getPayment()));
+		resp.setAttributes(buyerOrder.getAttributes());
     	//支付时间
     	if(null != buyerOrder.getPayment()) {
     		OrdersPay ordersPay = ordersPayMapper.selectByOrderCode(buyerOrder.getOrderCode());

@@ -303,7 +303,7 @@ function getOrderInfo(orderCode){
             	 $("#clientTypeStr").html(result.data.clientTypeStr);
             	 $("#payment").html(result.data.payment);
             	 $("#payTime").html(result.data.payTime);
-            	 $("#sellerSendGoodsTime").html(result.data.sellerSendGoodsTime);
+            	 $("#sellerSendGoodsTime").html((result.data.sellerSendGoodsTime ? result.data.sellerSendGoodsTime : '') + (result.data.attributes == 4 ? '【预售】' : ''));
             	 $("#sellerWaybillCode").html(result.data.sellerWaybillCode);
             	 $("#platformSendGoodsTime").html(result.data.platformSendGoodsTime);
             	 $("#platformWaybillCode").html(result.data.platformWaybillCode);