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

code cleanup

pull/6221/head
Gauthier LO 2024-03-28 11:17:47 +01:00
parent 7e0a86623c
commit 94f93d0672
3 changed files with 35 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/shippingInvoice/InvoiceController.java
View File

@ -961,7 +961,7 @@ public class InvoiceController {
String email = sysUser.getEmail(); String email = sysUser.getEmail();
String invoiceID; String invoiceID;
String customerFullName; String customerFullName;
boolean isShippingInvoice = invoiceNumber.charAt(8) == '7' || invoiceNumber.charAt(8) == '2'; boolean isShippingInvoice = Invoice.getType(invoiceNumber).equalsIgnoreCase(Invoice.InvoiceType.COMPLETE.name()) || Invoice.getType(invoiceNumber).equalsIgnoreCase(Invoice.InvoiceType.SHIPPING.name());
if(isShippingInvoice) if(isShippingInvoice)
invoiceID = iShippingInvoiceService.getShippingInvoiceId(invoiceNumber); invoiceID = iShippingInvoiceService.getShippingInvoiceId(invoiceNumber);
else else

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/PlatformOrderShippingInvoiceService.java
View File

@ -729,7 +729,7 @@ public class PlatformOrderShippingInvoiceService {
List<Path> pathList = new ArrayList<>(); List<Path> pathList = new ArrayList<>();
if(filetype.equals("invoice")) { if(filetype.equals("invoice")) {
log.info("File asked is of type invoice"); log.info("File asked is of type invoice");
if(invoiceNumber.charAt(8) == '1') if(Invoice.getType(invoiceNumber).equalsIgnoreCase(Invoice.InvoiceType.PURCHASE.name()))
pathList = getPath(PURCHASE_INVOICE_DIR, invoiceNumber); pathList = getPath(PURCHASE_INVOICE_DIR, invoiceNumber);
else else
pathList = getPath(INVOICE_DIR, invoiceNumber); pathList = getPath(INVOICE_DIR, invoiceNumber);

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

@ -56,22 +56,22 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
@Override @Override
public boolean cancelInvoice(String id, String invoiceNumber, String clientId) { public boolean cancelInvoice(String id, String invoiceNumber, String clientId) {
String invoiceEntity = clientService.getById(clientId).getInvoiceEntity(); String invoiceEntity = clientService.getById(clientId).getInvoiceEntity();
switch (invoiceNumber.charAt(8)) {
case '1': if(Invoice.getType(invoiceNumber).equalsIgnoreCase(Invoice.InvoiceType.PURCHASE.name())) {
PurchaseOrder po = purchaseOrderService.getById(id); PurchaseOrder po = purchaseOrderService.getById(id);
if(po.getInventoryDocumentString() != null && !po.getInventoryDocumentString().isEmpty()) if (po.getInventoryDocumentString() != null && !po.getInventoryDocumentString().isEmpty())
shippingInvoiceService.deleteAttachmentFile(po.getInventoryDocumentString()); shippingInvoiceService.deleteAttachmentFile(po.getInventoryDocumentString());
if(po.getPaymentDocumentString() != null && !po.getPaymentDocumentString().isEmpty()) if (po.getPaymentDocumentString() != null && !po.getPaymentDocumentString().isEmpty())
shippingInvoiceService.deleteAttachmentFile(po.getPaymentDocumentString()); shippingInvoiceService.deleteAttachmentFile(po.getPaymentDocumentString());
platformOrderService.removePurchaseInvoiceNumber(invoiceNumber); platformOrderService.removePurchaseInvoiceNumber(invoiceNumber);
purchaseOrderService.deleteInvoice(invoiceNumber); purchaseOrderService.deleteInvoice(invoiceNumber);
break; }
case '2': if(Invoice.getType(invoiceNumber).equalsIgnoreCase(Invoice.InvoiceType.SHIPPING.name())) {
platformOrderContentService.cancelInvoice(invoiceNumber); platformOrderContentService.cancelInvoice(invoiceNumber);
platformOrderService.cancelInvoice(invoiceNumber); platformOrderService.cancelInvoice(invoiceNumber);
shippingInvoiceService.delMain(id); shippingInvoiceService.delMain(id);
break; }
case '7': if(Invoice.getType(invoiceNumber).equalsIgnoreCase(Invoice.InvoiceType.COMPLETE.name())) {
platformOrderContentService.cancelInvoice(invoiceNumber); platformOrderContentService.cancelInvoice(invoiceNumber);
platformOrderService.removePurchaseInvoiceNumber(invoiceNumber); platformOrderService.removePurchaseInvoiceNumber(invoiceNumber);
platformOrderService.cancelInvoice(invoiceNumber); platformOrderService.cancelInvoice(invoiceNumber);
@ -82,9 +82,6 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
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());
break;
default:
throw new IllegalArgumentException("Invalid invoice number.");
} }
savRefundService.cancelInvoice(invoiceNumber); savRefundService.cancelInvoice(invoiceNumber);
@ -99,15 +96,15 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
@Override @Override
public boolean cancelBatchInvoice(List<Invoice> invoices) { public boolean cancelBatchInvoice(List<Invoice> invoices) {
List<String> purchaseInvoiceNumbers = invoices.stream().map(Invoice::getInvoiceNumber).filter(invoiceNumber -> invoiceNumber.charAt(8) == '1').collect(Collectors.toList()); List<String> purchaseInvoiceNumbers = invoices.stream().map(Invoice::getInvoiceNumber).filter(invoiceNumber -> Invoice.getType(invoiceNumber).equalsIgnoreCase(Invoice.InvoiceType.PURCHASE.name())).collect(Collectors.toList());
List<String> shippingInvoiceNumbers = invoices.stream().map(Invoice::getInvoiceNumber).filter(invoiceNumber -> invoiceNumber.charAt(8) == '2').collect(Collectors.toList()); List<String> shippingInvoiceNumbers = invoices.stream().map(Invoice::getInvoiceNumber).filter(invoiceNumber -> Invoice.getType(invoiceNumber).equalsIgnoreCase(Invoice.InvoiceType.SHIPPING.name())).collect(Collectors.toList());
List<String> completeInvoiceNumbers = invoices.stream().map(Invoice::getInvoiceNumber).filter(invoiceNumber -> invoiceNumber.charAt(8) == '7').collect(Collectors.toList()); List<String> completeInvoiceNumbers = invoices.stream().map(Invoice::getInvoiceNumber).filter(invoiceNumber -> Invoice.getType(invoiceNumber).equalsIgnoreCase(Invoice.InvoiceType.COMPLETE.name())).collect(Collectors.toList());
log.info("Cancelling {} purchase invoices : {}", purchaseInvoiceNumbers.size(), purchaseInvoiceNumbers); log.info("Cancelling {} purchase invoices : {}", purchaseInvoiceNumbers.size(), purchaseInvoiceNumbers);
log.info("Cancelling {} shipping invoices : {}", shippingInvoiceNumbers.size(), shippingInvoiceNumbers); log.info("Cancelling {} shipping invoices : {}", shippingInvoiceNumbers.size(), shippingInvoiceNumbers);
log.info("Cancelling {} complete invoices : {}", completeInvoiceNumbers.size(), completeInvoiceNumbers); log.info("Cancelling {} complete invoices : {}", completeInvoiceNumbers.size(), completeInvoiceNumbers);
if(!purchaseInvoiceNumbers.isEmpty()) { if(!purchaseInvoiceNumbers.isEmpty()) {
List<Invoice> purchaseInvoices = invoices.stream().filter(invoice -> invoice.getInvoiceNumber().charAt(8) == '1').collect(Collectors.toList()); List<Invoice> purchaseInvoices = invoices.stream().filter(invoice -> Invoice.getType(invoice.getInvoiceNumber()).equalsIgnoreCase(Invoice.InvoiceType.PURCHASE.name())).collect(Collectors.toList());
List<String> ids = purchaseInvoices.stream().map(Invoice::getId).collect(Collectors.toList()); List<String> ids = purchaseInvoices.stream().map(Invoice::getId).collect(Collectors.toList());
List<PurchaseOrder> purchaseOrders = purchaseOrderService.getPurchasesByInvoices(purchaseInvoices); List<PurchaseOrder> purchaseOrders = purchaseOrderService.getPurchasesByInvoices(purchaseInvoices);
@ -126,7 +123,7 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
} }
if(!shippingInvoiceNumbers.isEmpty()) { if(!shippingInvoiceNumbers.isEmpty()) {
List<String> ids = invoices.stream().filter(invoice -> invoice.getInvoiceNumber().charAt(8) == '2').map(Invoice::getId).collect(Collectors.toList()); List<String> ids = invoices.stream().filter(invoice -> Invoice.getType(invoice.getInvoiceNumber()).equalsIgnoreCase(Invoice.InvoiceType.SHIPPING.name())).map(Invoice::getId).collect(Collectors.toList());
platformOrderContentService.cancelBatchInvoice(shippingInvoiceNumbers); platformOrderContentService.cancelBatchInvoice(shippingInvoiceNumbers);
platformOrderService.cancelBatchInvoice(shippingInvoiceNumbers); platformOrderService.cancelBatchInvoice(shippingInvoiceNumbers);
savRefundService.cancelBatchInvoice(shippingInvoiceNumbers); savRefundService.cancelBatchInvoice(shippingInvoiceNumbers);
@ -136,7 +133,7 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
} }
if(!completeInvoiceNumbers.isEmpty()) { if(!completeInvoiceNumbers.isEmpty()) {
List<Invoice> completeInvoices = invoices.stream().filter(invoice -> invoice.getInvoiceNumber().charAt(8) == '7').collect(Collectors.toList()); List<Invoice> completeInvoices = invoices.stream().filter(invoice -> Invoice.getType(invoice.getInvoiceNumber()).equalsIgnoreCase(Invoice.InvoiceType.COMPLETE.name())).collect(Collectors.toList());
List<String> ids = completeInvoices.stream().map(Invoice::getId).collect(Collectors.toList()); List<String> ids = completeInvoices.stream().map(Invoice::getId).collect(Collectors.toList());
//shipping cancel //shipping cancel
platformOrderContentService.cancelBatchInvoice(completeInvoiceNumbers); platformOrderContentService.cancelBatchInvoice(completeInvoiceNumbers);
@ -177,7 +174,7 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
public boolean deleteInvoice(String invoiceNumber, String invoiceEntity) { public boolean deleteInvoice(String invoiceNumber, String invoiceEntity) {
boolean invoiceDeleted = false, detailDeleted = false; boolean invoiceDeleted = false, detailDeleted = false;
List<Path> invoicePathList = shippingInvoiceService.getPath(invoiceNumber.charAt(8) == '1' ? PURCHASE_INVOICE_LOCATION : SHIPPING_INVOICE_LOCATION, invoiceNumber, invoiceEntity); List<Path> invoicePathList = shippingInvoiceService.getPath(Invoice.getType(invoiceNumber).equalsIgnoreCase(Invoice.InvoiceType.PURCHASE.name()) ? PURCHASE_INVOICE_LOCATION : SHIPPING_INVOICE_LOCATION, invoiceNumber, invoiceEntity);
List<Path> detailPathList = shippingInvoiceService.getPath(SHIPPING_INVOICE_DETAIL_LOCATION, invoiceNumber, invoiceEntity); List<Path> detailPathList = shippingInvoiceService.getPath(SHIPPING_INVOICE_DETAIL_LOCATION, invoiceNumber, invoiceEntity);
if(invoicePathList.isEmpty()) { if(invoicePathList.isEmpty()) {