diff --git a/src/main/java/com/sanluan/einvoice/service/PdfRegularInvoiceService.java b/src/main/java/com/sanluan/einvoice/service/PdfRegularInvoiceService.java index f963abe..c3114de 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 = "机器编号:(?\\d{12})|发票代码:(?\\d{12})|发票号码:(?1\\d{8})|:(?\\d{4}年\\d{2}月\\d{2}日)" + String reg = "机器编号:(?\\d{12})|发票代码:(?\\d{12})|发票号码:(?\\d{8})|:(?\\d{4}年\\d{2}月\\d{2}日)" + "|校验码:(?\\d{20}|\\S{4,})"; Pattern pattern = Pattern.compile(reg); Matcher matcher = pattern.matcher(allText); @@ -51,7 +51,7 @@ public static Invoice getRegularInvoice(String fullText, String allText, int pag } } { - String reg = "合计¥?(?[^ \\f\\n\\r\\t\\v\\*]*)(?:¥?(?\\S*)|\\*+)\\s"; + String reg = "合计¥?(?\\d+\\.\\d{2})¥?(?\\d+\\.\\d{2})?"; Pattern pattern = Pattern.compile(reg); Matcher matcher = pattern.matcher(allText); if (matcher.find()) {