github
/
jeecg-boot
mirror of https://github.com/jeecgboot/jeecg-boot
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #71 from LQYBill/fix/invoiceCancelNullPointerException 

fix : nullPointerException
pull/6221/head
Qiuyi LI 2024-04-16 15:29:29 +02:00 committed by GitHub
parent 09217a4dc7 bccd5fe3b5
commit 41732b39ae
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/InvoiceServiceImpl.java
View File

@ -74,16 +74,16 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
shippingInvoiceService.delMain(id); shippingInvoiceService.delMain(id);
} }
if(Invoice.getType(invoiceNumber).equalsIgnoreCase(COMPLETE.name())) { if(Invoice.getType(invoiceNumber).equalsIgnoreCase(COMPLETE.name())) {
platformOrderContentService.cancelInvoice(invoiceNumber);
platformOrderService.removePurchaseInvoiceNumber(invoiceNumber);
platformOrderService.cancelInvoice(invoiceNumber);
purchaseOrderService.cancelInvoice(invoiceNumber);
shippingInvoiceService.delMain(id);
PurchaseOrder purchase = purchaseOrderService.getPurchaseByInvoiceNumberAndClientId(invoiceNumber, clientId); PurchaseOrder purchase = purchaseOrderService.getPurchaseByInvoiceNumberAndClientId(invoiceNumber, clientId);
if(purchase.getInventoryDocumentString() != null && !purchase.getInventoryDocumentString().isEmpty()) if(purchase.getInventoryDocumentString() != null && !purchase.getInventoryDocumentString().isEmpty())
shippingInvoiceService.deleteAttachmentFile(purchase.getInventoryDocumentString()); shippingInvoiceService.deleteAttachmentFile(purchase.getInventoryDocumentString());
if(purchase.getPaymentDocumentString() != null && !purchase.getPaymentDocumentString().isEmpty()) if(purchase.getPaymentDocumentString() != null && !purchase.getPaymentDocumentString().isEmpty())
shippingInvoiceService.deleteAttachmentFile(purchase.getPaymentDocumentString()); shippingInvoiceService.deleteAttachmentFile(purchase.getPaymentDocumentString());
platformOrderContentService.cancelInvoice(invoiceNumber);
platformOrderService.removePurchaseInvoiceNumber(invoiceNumber);
platformOrderService.cancelInvoice(invoiceNumber);
purchaseOrderService.cancelInvoice(invoiceNumber);
shippingInvoiceService.delMain(id);
} }
savRefundService.cancelInvoice(invoiceNumber); savRefundService.cancelInvoice(invoiceNumber);