记得上下班打卡 | git大法好,push需谨慎

Commit 2f8d700c authored by jiangxiulong's avatar jiangxiulong

Merge remote-tracking branch 'origin/jxl_1214_refund' into dev_merchant

parents af74b6fc 520e3db1
......@@ -120,8 +120,8 @@ public class KylinOrderTicketsRefundServiceImpl {
BigDecimal chargesRatio = getChargesRatio(orderTicketVo.getUseStart(), performanceVo.getIsRefundPoundage());
BigDecimal chargesPrice = item.getPriceCanRefund().multiply(chargesRatio).setScale(2, BigDecimal.ROUND_HALF_UP);
item.setPriceCanRefund(item.getPriceCanRefund().subtract(chargesPrice));
if (item.getCanRefundedPrice().compareTo(BigDecimal.ZERO) == 1) {
item.setPriceCanRefund(item.getCanRefundedPrice().add(canRefundPriceExpress));
if (item.getPriceCanRefund().compareTo(BigDecimal.ZERO) == 1) {
item.setPriceCanRefund(item.getPriceCanRefund().add(canRefundPriceExpress));
}
item.setChargesRatio(chargesRatio);
item.setChargesPrice(chargesPrice);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment