From 534473ec5364c7a79f3f057549463436b0783178 Mon Sep 17 00:00:00 2001 From: gaorl Date: Tue, 4 Jul 2023 19:56:29 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A?= 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, 2 insertions(+) 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 c5555c79..58d6fe4f 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 @@ -1005,6 +1005,8 @@ public class OrderMergeServiceImpl implements OrderMergeService { //对比合计税额的误差，此处将不参与和与参与合并合并对比 BigDecimal hjse = mergeOutItem.stream().map(t -> new BigDecimal(t.getSe())).reduce(BigDecimal::add).get(); BigDecimal oldhjse = orderItemInfos.stream().map(t -> new BigDecimal(t.getSe())).reduce(BigDecimal::add).get(); + log.info("合并前{}",hjse.toString()); + log.info("合并后{}",oldhjse.toString()); if((termType && hjse.subtract(oldhjse).abs().doubleValue() > 0.06) || (!termType && hjse.subtract(oldhjse).abs().doubleValue() > 1.27)){ return R.error("合并失败,合并明细后价税合计超过总的误差范围"); }