From 3c41b7dab89b1db8d206e0cabd783bd0d086c5ee Mon Sep 17 00:00:00 2001 From: gaorl Date: Tue, 4 Jul 2023 21:05:38 +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?= 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 ee1025f0..c228660e 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 @@ -1001,10 +1001,10 @@ public class OrderMergeServiceImpl implements OrderMergeService { return R.error("当前勾选明细行未发现满足合并条件的数据"); } mergeOutItem.addAll(orderItemInfoList); - log.debug("明细合并合并后{}", JSONObject.toJSONString(mergeOutItem)); //对比合计税额的误差,此处将不参与和与参与合并合并对比 BigDecimal hjse = mergeOutItem.stream().map(t -> new BigDecimal(t.getSe())).reduce(BigDecimal::add).get(); + log.debug("明细合并合并后{},合并前税额{},合并后税额{}", JSONObject.toJSONString(mergeOutItem),oldhjse,hjse); if((termType && hjse.subtract(oldhjse).abs().doubleValue() > 0.06) || (!termType && hjse.subtract(oldhjse).abs().doubleValue() > 1.27)){ return R.error("合并失败,合并明细后价税合计超过总的误差范围"); }