From b5ba949b38f726bd137686eebe96e9db56b37308 Mon Sep 17 00:00:00 2001 From: "lisai17@sina.com" Date: Fri, 26 Mar 2021 17:55:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6master?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ssjygl/order/ordertemp/OrderTempSyncService.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java index 0bbba21..f2e7495 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java @@ -19,11 +19,7 @@ import com.cowr.ssjygl.invoice.receive.InvoiceReceiveService; import com.cowr.ssjygl.order.ordercluster.OrderclusterService; import com.cowr.ssjygl.prepay.refunddetail.RefundDetailService; import com.cowr.ssjygl.supermarket.product.SupermarketProductService; -import com.cowr.local.ssjygl.synctask.SyncTaskService; -import com.cowr.model.*; -import com.cowr.local.ssjygl.modifylog.ModifyLogSyncService; import com.cowr.ssjygl.prepay.prepaycustomer.PrepayCustomerService; -import com.cowr.ssjygl.supermarket.product.SupermarketProductService; import com.cowr.ssjygl.ticket.log.TicketLogService; import com.cowr.ssjygl.ticket.receive.TicketReceiveService; import com.cowr.ssjygl.transprice.TransPriceService; @@ -111,9 +107,9 @@ public class OrderTempSyncService { return Result.failed("没有有效的发票领用记录，或者发票已经被使用"); } - InvoiceLog invoiceLog = InvoiceLogService.me.checkInvalidInvoiceLog(invoice_number, invoice_code); + InvoiceLog invoiceLog = InvoiceLogService.me.checkUseInvoiceLog(invoice_number, invoice_code); if (invoiceLog != null) { - return Result.failedstr("发票 %s|%s 已作废", invoice_number, invoice_code); + return Result.failedstr("发票 %s|%s 已使用！重新打开结算界面，获取新的发票信息。", invoice_number, invoice_code); } receive.setSurplus(receive.getSurplus() - 1);