|
|
@ -2070,7 +2070,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { |
|
|
|
} |
|
|
|
} |
|
|
|
orderItemInfo.setCreateTime(new Date()); |
|
|
|
orderItemInfo.setCreateTime(new Date()); |
|
|
|
orderItemInfo.setSe(se.toString()); |
|
|
|
orderItemInfo.setSe(se.toString()); |
|
|
|
if(se.subtract(taxAmount).abs().longValue() > 0.06){ |
|
|
|
if(se.subtract(taxAmount).abs().doubleValue() > 0.06){ |
|
|
|
log.info("订单id:{}合并明细超过0.06",orderInfoId); |
|
|
|
log.info("订单id:{}合并明细超过0.06",orderInfoId); |
|
|
|
BigDecimal taxAndAmount = xmje.add(se); |
|
|
|
BigDecimal taxAndAmount = xmje.add(se); |
|
|
|
BigDecimal taxAmountNew = taxAndAmount.divide(new BigDecimal("1").add(taxRate),0).multiply(taxRate).setScale(2,RoundingMode.HALF_UP); |
|
|
|
BigDecimal taxAmountNew = taxAndAmount.divide(new BigDecimal("1").add(taxRate),0).multiply(taxRate).setScale(2,RoundingMode.HALF_UP); |
|
|
|