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

Commit 28649c6c authored by 胡佳晨's avatar 胡佳晨

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

parents c1c70cf1 2f8d700c
...@@ -119,7 +119,10 @@ public class KylinOrderTicketsRefundServiceImpl { ...@@ -119,7 +119,10 @@ public class KylinOrderTicketsRefundServiceImpl {
// 手续费处理 // 手续费处理
BigDecimal chargesRatio = getChargesRatio(orderTicketVo.getUseStart(), performanceVo.getIsRefundPoundage()); BigDecimal chargesRatio = getChargesRatio(orderTicketVo.getUseStart(), performanceVo.getIsRefundPoundage());
BigDecimal chargesPrice = item.getPriceCanRefund().multiply(chargesRatio).setScale(2, BigDecimal.ROUND_HALF_UP); BigDecimal chargesPrice = item.getPriceCanRefund().multiply(chargesRatio).setScale(2, BigDecimal.ROUND_HALF_UP);
item.setPriceCanRefund(item.getPriceCanRefund().subtract(chargesPrice).add(canRefundPriceExpress)); item.setPriceCanRefund(item.getPriceCanRefund().subtract(chargesPrice));
if (item.getPriceCanRefund().compareTo(BigDecimal.ZERO) == 1) {
item.setPriceCanRefund(item.getPriceCanRefund().add(canRefundPriceExpress));
}
item.setChargesRatio(chargesRatio); item.setChargesRatio(chargesRatio);
item.setChargesPrice(chargesPrice); 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