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("合并失败,合并明细后价税合计超过总的误差范围"); }