From a28a8424b443706fe074031575c5b96d9622ba67 Mon Sep 17 00:00:00 2001 From: gaorl Date: Fri, 4 Aug 2023 14:04:26 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E6=98=8E=E7=BB=86=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E6=96=B9=E6=A0=BC=E6=98=8E=E7=BB=86=E8=A1=8C=E8=B6=85?= =?UTF-8?q?5=E5=88=86=E9=92=B1=E8=BF=9B=E8=A1=8C=E4=BB=B7=E7=A8=8E?= =?UTF-8?q?=E5=88=86=E7=A6=BB=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/service/impl/OrderMergeServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java index 9c949b5a..604d58a9 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java @@ -981,7 +981,7 @@ public class OrderMergeServiceImpl implements OrderMergeService { } orderItemInfo.setCreateTime(new Date()); orderItemInfo.setSe(se.toString()); - if((termType && se.subtract(taxAmount).abs().doubleValue() > 0.01) || (!termType &&se.subtract(taxAmount).abs().doubleValue() > 0.06)){ + if((termType && se.subtract(taxAmount).abs().doubleValue() > 0.01) || (!termType &&se.subtract(taxAmount).abs().doubleValue() > 0.05)){ log.info("订单id：{}合并明细误差超过额度",orderInfo.getId()); BigDecimal taxAndAmount = xmje.add(se); BigDecimal taxAmountNew = taxAndAmount.divide(new BigDecimal("1").add(taxRate),0).multiply(taxRate).setScale(2,RoundingMode.HALF_UP);