From 3e032cc580a25851a7a1a09d027f0586d5ab8a21 Mon Sep 17 00:00:00 2001
From: zyj <853304383@qq.com>
Date: Thu, 25 Apr 2024 11:53:17 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=8F=91=E7=A5=A8?=
 =?UTF-8?q?=E5=8F=B7=E7=A0=81=E6=AD=A3=E5=88=99=E8=A1=A8=E8=BE=BE=E5=BC=8F?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/sanluan/einvoice/service/PdfRegularInvoiceService.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/sanluan/einvoice/service/PdfRegularInvoiceService.java b/src/main/java/com/sanluan/einvoice/service/PdfRegularInvoiceService.java
index f963abe..8e46473 100644
--- a/src/main/java/com/sanluan/einvoice/service/PdfRegularInvoiceService.java
+++ b/src/main/java/com/sanluan/einvoice/service/PdfRegularInvoiceService.java
@@ -32,7 +32,7 @@ public class PdfRegularInvoiceService {
     public static Invoice getRegularInvoice(String fullText, String allText, int pageWidth, PDDocument doc, PDPage firstPage ) throws IOException {
         Invoice invoice = new Invoice();
         {
-            String reg = "机器编号:(?<machineNumber>\\d{12})|发票代码:(?<code>\\d{12})|发票号码:(?<number>1\\d{8})|:(?<date>\\d{4}年\\d{2}月\\d{2}日)"
+            String reg = "机器编号:(?<machineNumber>\\d{12})|发票代码:(?<code>\\d{12})|发票号码:(?<number>\\d{8})|:(?<date>\\d{4}年\\d{2}月\\d{2}日)"
                     + "|校验码:(?<checksum>\\d{20}|\\S{4,})";
             Pattern pattern = Pattern.compile(reg);
             Matcher matcher = pattern.matcher(allText);

From e20515bb71465ea5e3dba70f5f93093e4db1d141 Mon Sep 17 00:00:00 2001
From: zyj <853304383@qq.com>
Date: Thu, 25 Apr 2024 12:32:43 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=88=E8=AE=A1?=
 =?UTF-8?q?=E6=AD=A3=E5=88=99=E8=A1=A8=E8=BE=BE=E5=BC=8F=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/sanluan/einvoice/service/PdfRegularInvoiceService.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/sanluan/einvoice/service/PdfRegularInvoiceService.java b/src/main/java/com/sanluan/einvoice/service/PdfRegularInvoiceService.java
index 8e46473..c3114de 100644
--- a/src/main/java/com/sanluan/einvoice/service/PdfRegularInvoiceService.java
+++ b/src/main/java/com/sanluan/einvoice/service/PdfRegularInvoiceService.java
@@ -51,7 +51,7 @@ public static Invoice getRegularInvoice(String fullText, String allText, int pag
             }
         }
         {
-            String reg = "合计¥?(?<amount>[^ \\f\\n\\r\\t\\v\\*]*)(?:¥?(?<taxAmount>\\S*)|\\*+)\\s";
+            String reg = "合计¥?(?<amount>\\d+\\.\\d{2})¥?(?<taxAmount>\\d+\\.\\d{2})?";
             Pattern pattern = Pattern.compile(reg);
             Matcher matcher = pattern.matcher(allText);
             if (matcher.find()) {