From 7f5ba0b84b5501c144db829d30cd38b63880fc66 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Fri, 20 Jan 2023 15:00:50 +0800 Subject: [PATCH 1/4] =?UTF-8?q?doc:=20=E5=A2=9E=E5=8A=A0=E8=BE=93=E5=87=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaiduOcr/BaiduOcrVerifyVatInvoice.razor | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/src/BootstrapBlazor.Shared/Demos/BaiduOcr/BaiduOcrVerifyVatInvoice.razor b/src/BootstrapBlazor.Shared/Demos/BaiduOcr/BaiduOcrVerifyVatInvoice.razor index 3754c5b19bc..d09bfa5658c 100644 --- a/src/BootstrapBlazor.Shared/Demos/BaiduOcr/BaiduOcrVerifyVatInvoice.razor +++ b/src/BootstrapBlazor.Shared/Demos/BaiduOcr/BaiduOcrVerifyVatInvoice.razor @@ -5,7 +5,7 @@ - + @@ -18,9 +18,13 @@ -@if (InvoiceVerifyResult != null) +@if (Result != null && Result.ErrorCode == 0) { -
@InvoiceVerifyResult.VerifyMessage
+
@Result.Entity?.VerifyMessage
+} +else +{ +
@ResultMessage
} @code { @@ -29,14 +33,20 @@ /// private CancellationTokenSource? TokenSource { get; set; } - private InvoiceVerifyResult? InvoiceVerifyResult { get; set; } + private BaiduOcrResult? Result { get; set; } + + private string? ResultMessage { get; set; } private InvoiceForm Model { get; set; } = new() { InvoiceType = "elec_special_vat_invoice", TotalAmount = "0" }; private async Task Verify(EditContext context) { - var result = await OcrService.VerifyInvoiceAsync(Model.InvoiceCode, Model.InvoiceNum, Model.InvoiceDate, Model.InvoiceType, Model.CheckCode, Model.TotalAmount); - InvoiceVerifyResult = result.Entity; + ResultMessage = ""; + Result = await OcrService.VerifyInvoiceAsync(Model.InvoiceCode, Model.InvoiceNum, Model.InvoiceDate, Model.InvoiceType, Model.CheckCode, Model.TotalAmount); + if (Result != null && Result.ErrorCode != 0) + { + ResultMessage = $"{Result.ErrorCode}: {Result.ErrorMessage}"; + } StateHasChanged(); } From bca1c5d456f32b02d1b8ef266db71873f16599e0 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Fri, 20 Jan 2023 15:03:47 +0800 Subject: [PATCH 2/4] =?UTF-8?q?doc:=20=E6=9B=B4=E6=96=B0=E9=AA=8C=E7=9C=9F?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E4=BD=BF=E7=94=A8=E5=BC=B9=E7=AA=97=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaiduOcr/BaiduOcrVerifyVatInvoice.razor | 23 ++++++------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/src/BootstrapBlazor.Shared/Demos/BaiduOcr/BaiduOcrVerifyVatInvoice.razor b/src/BootstrapBlazor.Shared/Demos/BaiduOcr/BaiduOcrVerifyVatInvoice.razor index d09bfa5658c..928790a31f9 100644 --- a/src/BootstrapBlazor.Shared/Demos/BaiduOcr/BaiduOcrVerifyVatInvoice.razor +++ b/src/BootstrapBlazor.Shared/Demos/BaiduOcr/BaiduOcrVerifyVatInvoice.razor @@ -18,36 +18,27 @@ -@if (Result != null && Result.ErrorCode == 0) -{ -
@Result.Entity?.VerifyMessage
-} -else -{ -
@ResultMessage
-} - @code { /// /// 取消请求令牌 /// private CancellationTokenSource? TokenSource { get; set; } - private BaiduOcrResult? Result { get; set; } - private string? ResultMessage { get; set; } private InvoiceForm Model { get; set; } = new() { InvoiceType = "elec_special_vat_invoice", TotalAmount = "0" }; private async Task Verify(EditContext context) { - ResultMessage = ""; - Result = await OcrService.VerifyInvoiceAsync(Model.InvoiceCode, Model.InvoiceNum, Model.InvoiceDate, Model.InvoiceType, Model.CheckCode, Model.TotalAmount); - if (Result != null && Result.ErrorCode != 0) + var result = await OcrService.VerifyInvoiceAsync(Model.InvoiceCode, Model.InvoiceNum, Model.InvoiceDate, Model.InvoiceType, Model.CheckCode, Model.TotalAmount); + if (result.ErrorCode != 0) + { + await ToastService.Information("Verify Vat", $"{result.ErrorCode}: {result.ErrorMessage}"); + } + else if (result.Entity != null) { - ResultMessage = $"{Result.ErrorCode}: {Result.ErrorMessage}"; + await ToastService.Success("Verify Vat", result.Entity?.VerifyMessage); } - StateHasChanged(); } /// From 6759c6080a84406416b04a7a6110ec700e0831d1 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Fri, 20 Jan 2023 15:11:24 +0800 Subject: [PATCH 3/4] =?UTF-8?q?refactor:=20=E7=A7=BB=E9=99=A4=E4=B8=8D?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=9A=84=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Demos/BaiduOcr/BaiduOcrVerifyVatInvoice.razor | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/BootstrapBlazor.Shared/Demos/BaiduOcr/BaiduOcrVerifyVatInvoice.razor b/src/BootstrapBlazor.Shared/Demos/BaiduOcr/BaiduOcrVerifyVatInvoice.razor index 928790a31f9..fd3f10f06e5 100644 --- a/src/BootstrapBlazor.Shared/Demos/BaiduOcr/BaiduOcrVerifyVatInvoice.razor +++ b/src/BootstrapBlazor.Shared/Demos/BaiduOcr/BaiduOcrVerifyVatInvoice.razor @@ -24,8 +24,6 @@ /// private CancellationTokenSource? TokenSource { get; set; } - private string? ResultMessage { get; set; } - private InvoiceForm Model { get; set; } = new() { InvoiceType = "elec_special_vat_invoice", TotalAmount = "0" }; private async Task Verify(EditContext context) From 9a9572b725a880bb12ed8c3a36acb4e4e7ba6fca Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Fri, 20 Jan 2023 15:22:42 +0800 Subject: [PATCH 4/4] doc: remove xml --- .../Demos/BaiduOcr/BaiduOcrVerifyVatInvoice.razor | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/BootstrapBlazor.Shared/Demos/BaiduOcr/BaiduOcrVerifyVatInvoice.razor b/src/BootstrapBlazor.Shared/Demos/BaiduOcr/BaiduOcrVerifyVatInvoice.razor index fd3f10f06e5..da672235ffb 100644 --- a/src/BootstrapBlazor.Shared/Demos/BaiduOcr/BaiduOcrVerifyVatInvoice.razor +++ b/src/BootstrapBlazor.Shared/Demos/BaiduOcr/BaiduOcrVerifyVatInvoice.razor @@ -19,9 +19,6 @@ @code { - /// - /// 取消请求令牌 - /// private CancellationTokenSource? TokenSource { get; set; } private InvoiceForm Model { get; set; } = new() { InvoiceType = "elec_special_vat_invoice", TotalAmount = "0" };