From 90e89eb1ff17e4cf3f6222ced4a0b3ca875a0d85 Mon Sep 17 00:00:00 2001 From: gaorl Date: Fri, 4 Aug 2023 13:56:18 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E5=85=A8=E7=94=B5=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E5=BC=80=E5=85=B7=E6=9C=AA=E6=8E=A8=E9=80=81=E5=BD=B1?= =?UTF-8?q?=E5=83=8F=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manager/service/impl/PushInvoiceServiceImpl.java | 7 ++++++- .../modules/order/service/impl/OrderMergeServiceImpl.java | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java index ee3836b3..48d1b826 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java @@ -1766,7 +1766,12 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { resultToyxVo.setBuyerName(orderInvoiceInfo.getGhfMc()); resultToyxVo.setSellerName(orderInvoiceInfo.getXhfMc()); String terminalCode = orderInvoiceInfo.getSksbdm(); - if(OrderInfoEnum.ORDER_INVOICE_TYPE_51.getValue().equals(orderInvoiceInfo.getFpzlDm()) || OrderInfoEnum.ORDER_INVOICE_TYPE_52.getValue().equals(orderInvoiceInfo.getFpzlDm())){ + if(OrderInfoEnum.ORDER_INVOICE_TYPE_51.getValue().equals(orderInvoiceInfo.getFpzlDm()) + || OrderInfoEnum.ORDER_INVOICE_TYPE_52.getValue().equals(orderInvoiceInfo.getFpzlDm()) + || OrderInfoEnum.ORDER_INVOICE_TYPE_01.getValue().equals(orderInvoiceInfo.getFpzlDm()) + || OrderInfoEnum.ORDER_INVOICE_TYPE_02.getValue().equals(orderInvoiceInfo.getFpzlDm()) + + ){ OrderInfo orderInfo = orderInfoService.selectOrderInfoByOrderId(orderProcessInfo.getOrderInfoId(), shList); List fileDownLoadList = orderInvoiceInfoService.getInvoiceFile(orderInfo.getDdlx(), orderInvoiceInfo.getFpzlDm(), orderInvoiceInfo.getPdfUrl(), orderInvoiceInfo.getKplsh(), orderInvoiceInfo.getFpdm(), orderInvoiceInfo.getFphm(), orderInvoiceInfo.getXhfNsrsbh(), terminalCode,""); if (ObjectUtil.isNotEmpty(fileDownLoadList)) { 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 0a7329b1..44da331a 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);