feature:明细合并

release
gaorl 2 years ago
parent 46d632327d
commit edb754ca1e
  1. 4
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java

@ -2074,8 +2074,8 @@ public class OrderInfoServiceImpl implements OrderInfoService {
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);
BigDecimal xmjeNew = taxAndAmount.multiply(taxAmountNew); BigDecimal xmjeNew = taxAndAmount.subtract(taxAmountNew);
orderItemInfo.setXmje(xmje.add(se).subtract(taxAmountNew).toString()); orderItemInfo.setXmje(xmjeNew.toString());
orderItemInfo.setSe(taxAmountNew.toString()); orderItemInfo.setSe(taxAmountNew.toString());
if(StringUtils.isNotBlank(orderItemInfo.getXmsl())){ if(StringUtils.isNotBlank(orderItemInfo.getXmsl())){
BigDecimal xmdj = xmjeNew.divide(xmsl, 8, RoundingMode.HALF_UP); BigDecimal xmdj = xmjeNew.divide(xmsl, 8, RoundingMode.HALF_UP);

Loading…
Cancel
Save