Authored by wujiexiang

Merge branch 'dev-promotion' into test6.8.2

@@ -150,7 +150,7 @@ public abstract class AbsOrderDetailService implements IOrderDetailService{ @@ -150,7 +150,7 @@ public abstract class AbsOrderDetailService implements IOrderDetailService{
150 OrderDetailInfo.PriceInfo priceInfo = OrderDetailInfo.PriceInfo.builder() 150 OrderDetailInfo.PriceInfo priceInfo = OrderDetailInfo.PriceInfo.builder()
151 .goodPrice(buyerOrderGoods.getGoodsPrice() == null ? "0" : buyerOrderGoods.getGoodsPrice().toPlainString() ) 151 .goodPrice(buyerOrderGoods.getGoodsPrice() == null ? "0" : buyerOrderGoods.getGoodsPrice().toPlainString() )
152 .feePrice(buyerOrder.getShipFee() == null ? "0" : buyerOrder.getShipFee().toPlainString()) 152 .feePrice(buyerOrder.getShipFee() == null ? "0" : buyerOrder.getShipFee().toPlainString())
153 - .couponCutPrice(buyerOrderGoods.getCouponCutAmount() == null ? "0":buyerOrderGoods.getCouponCutAmount().toPlainString()) 153 + .couponCutPrice(buyerOrderGoods.getCouponCutAmount() == null ? "0.00":buyerOrderGoods.getCouponCutAmount().toPlainString())
154 .realPayPrice(buyerOrder.getAmount() == null ? "0" : buyerOrder.getAmount().toPlainString()) 154 .realPayPrice(buyerOrder.getAmount() == null ? "0" : buyerOrder.getAmount().toPlainString())
155 .build(); 155 .build();
156 orderDetailInfo.setPriceInfo(priceInfo); 156 orderDetailInfo.setPriceInfo(priceInfo);