From ec9a3925519cc30e00efcefa8bda324b98b9b5b6 Mon Sep 17 00:00:00 2001 From: "lisai17@sina.com" Date: Mon, 26 Oct 2020 17:40:21 +0800 Subject: [PATCH] . --- .../invalidverify/InvoiceInvalidVerifySyncService.java | 8 ++++---- .../invalidverify/OrderInvalidVerifySyncService.java | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/invoice/invalidverify/InvoiceInvalidVerifySyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/invoice/invalidverify/InvoiceInvalidVerifySyncService.java index 10a953a..00d3001 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/invoice/invalidverify/InvoiceInvalidVerifySyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/invoice/invalidverify/InvoiceInvalidVerifySyncService.java @@ -36,7 +36,7 @@ public class InvoiceInvalidVerifySyncService { } InvoiceInvalidVerify old = InvoiceInvalidVerify.dao.findFirst( - "select * from invoice_invalid_verify t where t.state = ? and t.order_sn = ? limit 1", 1, order_sn); + "select * from invoice_invalid_verify t where t.order_sn = ? and ( t.state = 1 or t.state = 2 ) limit 1", order_sn); if (old != null) { return Result.failedstr("订单 %s 已提交申请", order_sn); @@ -88,10 +88,10 @@ public class InvoiceInvalidVerifySyncService { public Result save(InvoiceInvalidVerify model, Sysuser sysuser) { InvoiceInvalidVerify old = InvoiceInvalidVerify.dao.findFirst( "select * from invoice_invalid_verify t \n" + - " where t.state = ? \n" + - " and t.invoice_number = ? \n" + + " wheret.invoice_number = ? \n" + " and t.invoice_code = ? \n" + - " limit 1", 1, model.getInvoiceNumber(), model.getInvoiceCode()); + " and ( t.state = 1 or t.state = 2 )" + + " limit 1", model.getInvoiceNumber(), model.getInvoiceCode()); if (old != null) { return Result.failedstr("发票 %s|%s 已提交申请", model.getInvoiceNumber(), model.getInvoiceCode()); diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/invalidverify/OrderInvalidVerifySyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/invalidverify/OrderInvalidVerifySyncService.java index 9518b4f..db96cef 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/invalidverify/OrderInvalidVerifySyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/invalidverify/OrderInvalidVerifySyncService.java @@ -32,9 +32,9 @@ public class OrderInvalidVerifySyncService { } OrderInvalidVerify old = OrderInvalidVerify.dao.findFirst("select * from order_invalid_verify t \n" + - " where t.state = ? \n" + - " and t.order_sn = ? \n" + - " limit 1", 1, order_sn); + " where t.order_sn = ? \n" + + " and ( t.state= 1 or t.state = 2 )\n" + + " limit 1", order_sn); if (old != null) { return Result.failedstr("订单 %s 已提交申请", order_sn);