合并master
parent
3a61b64cc1
commit
b5ba949b38
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Reference in New Issue