From bccd5fe3b57ee538682a4bc85742a37a3f26f9d0 Mon Sep 17 00:00:00 2001
From: Gauthier LO <lo.gauthier.glo@gmail.com>
Date: Mon, 8 Apr 2024 10:32:05 +0200
Subject: [PATCH] fix : nullPointerException

---
 .../business/service/impl/InvoiceServiceImpl.java      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/InvoiceServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/InvoiceServiceImpl.java
index bb8e06131..53a556e60 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/InvoiceServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/InvoiceServiceImpl.java
@@ -74,16 +74,16 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
             shippingInvoiceService.delMain(id);
         }
         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);
             if(purchase.getInventoryDocumentString() != null && !purchase.getInventoryDocumentString().isEmpty())
                 shippingInvoiceService.deleteAttachmentFile(purchase.getInventoryDocumentString());
             if(purchase.getPaymentDocumentString() != null && !purchase.getPaymentDocumentString().isEmpty())
                 shippingInvoiceService.deleteAttachmentFile(purchase.getPaymentDocumentString());
+            platformOrderContentService.cancelInvoice(invoiceNumber);
+            platformOrderService.removePurchaseInvoiceNumber(invoiceNumber);
+            platformOrderService.cancelInvoice(invoiceNumber);
+            purchaseOrderService.cancelInvoice(invoiceNumber);
+            shippingInvoiceService.delMain(id);
         }
         savRefundService.cancelInvoice(invoiceNumber);