Authored by LUOXC

Merge branch 'test6.9.8' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.8

@@ -274,7 +274,7 @@ public abstract class AbsOrderDetailService extends AbsOrderViewService implemen @@ -274,7 +274,7 @@ public abstract class AbsOrderDetailService extends AbsOrderViewService implemen
274 OrderAttributes oa = OrderAttributes.getOrderAttributes(buyerOrder.getAttributes()); 274 OrderAttributes oa = OrderAttributes.getOrderAttributes(buyerOrder.getAttributes());
275 275
276 if (Objects.equals(OrderAttributes.QUICK_DELIVER, oa)){ 276 if (Objects.equals(OrderAttributes.QUICK_DELIVER, oa)){
277 - priceInfo.setQuickDeliveServicePrice(MathUtils.formatStr(amountDetailBo.getDepositAmount())); 277 + priceInfo.setQuickDeliveServicePrice(MathUtils.formatStr(amountDetailBo.getQuickDeliveServiceAmount()));
278 } 278 }
279 279
280 if (Objects.equals(OrderAttributes.DEPOSITE, oa)){ 280 if (Objects.equals(OrderAttributes.DEPOSITE, oa)){