ufo / yohoufo-fore · Commits

Go to a project

Authored by chenchao
Commit d4b4c0bad0b04bc9c1f35ddca7a950f2068323a1 2 parents 90781c77 b688a3da

Merge branch 'dev_order' into test6.8.2

Inline Side-by-side
Showing 1 changed file with 1 additions and 1 deletions
@@ -157,7 +157,7 @@ public abstract class AbsOrderDetailService extends AbsOrderViewService implemen @@ -157,7 +157,7 @@ public abstract class AbsOrderDetailService extends AbsOrderViewService implemen
157 OrderDetailInfo.PriceInfo priceInfo = OrderDetailInfo.PriceInfo.builder() 157 OrderDetailInfo.PriceInfo priceInfo = OrderDetailInfo.PriceInfo.builder()
158 .goodPrice(buyerOrderGoods.getGoodsPrice() == null ? "0" : buyerOrderGoods.getGoodsPrice().toPlainString() ) 158 .goodPrice(buyerOrderGoods.getGoodsPrice() == null ? "0" : buyerOrderGoods.getGoodsPrice().toPlainString() )
159 .feePrice(buyerOrder.getShipFee() == null ? "0" : buyerOrder.getShipFee().toPlainString()) 159 .feePrice(buyerOrder.getShipFee() == null ? "0" : buyerOrder.getShipFee().toPlainString())
160 - .couponCutPrice(buyerOrderGoods.getCouponCutAmount() == null ? "0.00":buyerOrderGoods.getCouponCutAmount().toPlainString()) 160 + .couponCutPrice(buyerOrderGoods.getCouponCutAmount() == null ? "0.00": "-" + buyerOrderGoods.getCouponCutAmount().toPlainString())
161 .realPayPrice(buyerOrder.getAmount() == null ? "0" : buyerOrder.getAmount().toPlainString()) 161 .realPayPrice(buyerOrder.getAmount() == null ? "0" : buyerOrder.getAmount().toPlainString())
162 .build(); 162 .build();
163 orderDetailInfo.setPriceInfo(priceInfo); 163 orderDetailInfo.setPriceInfo(priceInfo);