From d9e746e620d14db924ba4f6063c84559b0fe6fde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Thu, 25 Jan 2024 15:14:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E5=8F=91=E7=A5=A8?= =?UTF-8?q?=E5=85=A5=E5=BA=93=EF=BC=9A=E6=98=8E=E7=BB=86=E5=A4=84=E7=90=86?= =?UTF-8?q?=E7=99=BE=E5=88=86=E6=95=B0=E3=80=81=E5=BC=80=E7=A5=A8=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E8=BD=AC=E5=8C=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/erp/service/SNPushCheckRecordService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java index fcd19041..e2854b32 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java @@ -864,7 +864,7 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { invoiceInfo.setImageId(invoice.getFileId()); if (StringUtils.isNotBlank(invoice.getBillingDate())){ - Date invoiceDate = DateUtils.strToDateLong(invoice.getBillingDate()); + Date invoiceDate = DateUtils.strToDate(invoice.getBillingDate()); invoiceInfo.setInvoiceDate(invoiceDate); } @@ -905,8 +905,8 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { BigDecimal taxRate = strToBigDecimal(invoiceDetail.getTaxRate()); if (taxRate != null){ invoiceDetailInfo.setTaxRate(taxRate.multiply(new BigDecimal("100")).stripTrailingZeros().toPlainString()); - }else { - invoiceDetailInfo.setTaxRate(invoiceDetail.getTaxRate()); + }else if (StringUtils.isBlank(invoiceDetail.getTaxRate())){ + invoiceDetailInfo.setTaxRate(invoiceDetail.getTaxRate().replace("%","")); } invoiceDetailList.add(invoiceDetailInfo);