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:20:36 +01:00
parent 94f93d0672
commit 59240a27e0
3 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,6 +55,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static org.jeecg.modules.business.entity.Invoice.InvoiceType.*;
import static org.jeecg.modules.business.entity.Task.TaskCode.SI_G; import static org.jeecg.modules.business.entity.Task.TaskCode.SI_G;
import static org.jeecg.modules.business.entity.TaskHistory.TaskStatus.*; import static org.jeecg.modules.business.entity.TaskHistory.TaskStatus.*;
@ -961,7 +962,7 @@ public class InvoiceController {
String email = sysUser.getEmail(); String email = sysUser.getEmail();
String invoiceID; String invoiceID;
String customerFullName; String customerFullName;
boolean isShippingInvoice = Invoice.getType(invoiceNumber).equalsIgnoreCase(Invoice.InvoiceType.COMPLETE.name()) || Invoice.getType(invoiceNumber).equalsIgnoreCase(Invoice.InvoiceType.SHIPPING.name()); boolean isShippingInvoice = Invoice.getType(invoiceNumber).equalsIgnoreCase(COMPLETE.name()) || Invoice.getType(invoiceNumber).equalsIgnoreCase(SHIPPING.name());
if(isShippingInvoice) if(isShippingInvoice)
invoiceID = iShippingInvoiceService.getShippingInvoiceId(invoiceNumber); invoiceID = iShippingInvoiceService.getShippingInvoiceId(invoiceNumber);
else else

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

@ -44,6 +44,8 @@ import java.util.stream.Stream;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream; import java.util.zip.ZipOutputStream;
import static org.jeecg.modules.business.entity.Invoice.InvoiceType.*;
@Service @Service
@Slf4j @Slf4j
public class PlatformOrderShippingInvoiceService { public class PlatformOrderShippingInvoiceService {
@ -729,7 +731,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(Invoice.getType(invoiceNumber).equalsIgnoreCase(Invoice.InvoiceType.PURCHASE.name())) if(Invoice.getType(invoiceNumber).equalsIgnoreCase(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);
@ -813,13 +815,13 @@ public class PlatformOrderShippingInvoiceService {
purchaseOrderService, purchaseOrderContentMapper, skuPromotionHistoryMapper, savRefundService, savRefundWithDetailService, emailService, env); purchaseOrderService, purchaseOrderContentMapper, skuPromotionHistoryMapper, savRefundService, savRefundWithDetailService, emailService, env);
Path out = null; Path out = null;
if(filetype.equals("invoice")) { if(filetype.equals("invoice")) {
if(Invoice.getType(invoiceNumber).equalsIgnoreCase(Invoice.InvoiceType.PURCHASE.name())) { if(Invoice.getType(invoiceNumber).equalsIgnoreCase(PURCHASE.name())) {
PurchaseInvoice invoice = factory.buildExistingPurchaseInvoice(invoiceNumber); PurchaseInvoice invoice = factory.buildExistingPurchaseInvoice(invoiceNumber);
InvoiceMetaData invoiceMetaData = getInvoiceMetaData(invoice); InvoiceMetaData invoiceMetaData = getInvoiceMetaData(invoice);
String filename = "Invoice N°" + invoice.code() + " (" + invoice.client().getInvoiceEntity() + ").xlsx"; String filename = "Invoice N°" + invoice.code() + " (" + invoice.client().getInvoiceEntity() + ").xlsx";
out = Paths.get(PURCHASE_INVOICE_DIR, filename); out = Paths.get(PURCHASE_INVOICE_DIR, filename);
} }
if(Invoice.getType(invoiceNumber).equalsIgnoreCase(Invoice.InvoiceType.SHIPPING.name())) { if(Invoice.getType(invoiceNumber).equalsIgnoreCase(SHIPPING.name())) {
Client client = shippingInvoiceMapper.getClientByInvoiceNumber(invoiceNumber); Client client = shippingInvoiceMapper.getClientByInvoiceNumber(invoiceNumber);
Map<String, String> period = platformOrderService.fetchShippingPeriodAndType(invoiceNumber); Map<String, String> period = platformOrderService.fetchShippingPeriodAndType(invoiceNumber);
String clientId = client.getId(); String clientId = client.getId();
@ -829,7 +831,7 @@ public class PlatformOrderShippingInvoiceService {
String filename = "Invoice N°" + invoice.code() + " (" + invoice.client().getInvoiceEntity() + ").xlsx"; String filename = "Invoice N°" + invoice.code() + " (" + invoice.client().getInvoiceEntity() + ").xlsx";
out = Paths.get(INVOICE_DIR, filename); out = Paths.get(INVOICE_DIR, filename);
} }
if(Invoice.getType(invoiceNumber).equalsIgnoreCase(Invoice.InvoiceType.COMPLETE.name())) { if(Invoice.getType(invoiceNumber).equalsIgnoreCase(COMPLETE.name())) {
Client client = shippingInvoiceMapper.getClientByInvoiceNumber(invoiceNumber); Client client = shippingInvoiceMapper.getClientByInvoiceNumber(invoiceNumber);
Map<String, String> period = platformOrderService.fetchShippingPeriodAndType(invoiceNumber); Map<String, String> period = platformOrderService.fetchShippingPeriodAndType(invoiceNumber);
String clientId = client.getId(); String clientId = client.getId();

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

@ -17,6 +17,8 @@ import java.nio.file.Path;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static org.jeecg.modules.business.entity.Invoice.InvoiceType.*;
@Service @Service
@Slf4j @Slf4j
public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> implements InvoiceService { public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> implements InvoiceService {
@ -57,7 +59,7 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
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();
if(Invoice.getType(invoiceNumber).equalsIgnoreCase(Invoice.InvoiceType.PURCHASE.name())) { if(Invoice.getType(invoiceNumber).equalsIgnoreCase(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());
@ -66,12 +68,12 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
platformOrderService.removePurchaseInvoiceNumber(invoiceNumber); platformOrderService.removePurchaseInvoiceNumber(invoiceNumber);
purchaseOrderService.deleteInvoice(invoiceNumber); purchaseOrderService.deleteInvoice(invoiceNumber);
} }
if(Invoice.getType(invoiceNumber).equalsIgnoreCase(Invoice.InvoiceType.SHIPPING.name())) { if(Invoice.getType(invoiceNumber).equalsIgnoreCase(SHIPPING.name())) {
platformOrderContentService.cancelInvoice(invoiceNumber); platformOrderContentService.cancelInvoice(invoiceNumber);
platformOrderService.cancelInvoice(invoiceNumber); platformOrderService.cancelInvoice(invoiceNumber);
shippingInvoiceService.delMain(id); shippingInvoiceService.delMain(id);
} }
if(Invoice.getType(invoiceNumber).equalsIgnoreCase(Invoice.InvoiceType.COMPLETE.name())) { if(Invoice.getType(invoiceNumber).equalsIgnoreCase(COMPLETE.name())) {
platformOrderContentService.cancelInvoice(invoiceNumber); platformOrderContentService.cancelInvoice(invoiceNumber);
platformOrderService.removePurchaseInvoiceNumber(invoiceNumber); platformOrderService.removePurchaseInvoiceNumber(invoiceNumber);
platformOrderService.cancelInvoice(invoiceNumber); platformOrderService.cancelInvoice(invoiceNumber);
@ -96,15 +98,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 -> Invoice.getType(invoiceNumber).equalsIgnoreCase(Invoice.InvoiceType.PURCHASE.name())).collect(Collectors.toList()); List<String> purchaseInvoiceNumbers = invoices.stream().map(Invoice::getInvoiceNumber).filter(invoiceNumber -> Invoice.getType(invoiceNumber).equalsIgnoreCase(PURCHASE.name())).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> shippingInvoiceNumbers = invoices.stream().map(Invoice::getInvoiceNumber).filter(invoiceNumber -> Invoice.getType(invoiceNumber).equalsIgnoreCase(SHIPPING.name())).collect(Collectors.toList());
List<String> completeInvoiceNumbers = invoices.stream().map(Invoice::getInvoiceNumber).filter(invoiceNumber -> Invoice.getType(invoiceNumber).equalsIgnoreCase(Invoice.InvoiceType.COMPLETE.name())).collect(Collectors.toList()); List<String> completeInvoiceNumbers = invoices.stream().map(Invoice::getInvoiceNumber).filter(invoiceNumber -> Invoice.getType(invoiceNumber).equalsIgnoreCase(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.getType(invoice.getInvoiceNumber()).equalsIgnoreCase(Invoice.InvoiceType.PURCHASE.name())).collect(Collectors.toList()); List<Invoice> purchaseInvoices = invoices.stream().filter(invoice -> Invoice.getType(invoice.getInvoiceNumber()).equalsIgnoreCase(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);
@ -123,7 +125,7 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
} }
if(!shippingInvoiceNumbers.isEmpty()) { if(!shippingInvoiceNumbers.isEmpty()) {
List<String> ids = invoices.stream().filter(invoice -> Invoice.getType(invoice.getInvoiceNumber()).equalsIgnoreCase(Invoice.InvoiceType.SHIPPING.name())).map(Invoice::getId).collect(Collectors.toList()); List<String> ids = invoices.stream().filter(invoice -> Invoice.getType(invoice.getInvoiceNumber()).equalsIgnoreCase(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);
@ -133,7 +135,7 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
} }
if(!completeInvoiceNumbers.isEmpty()) { if(!completeInvoiceNumbers.isEmpty()) {
List<Invoice> completeInvoices = invoices.stream().filter(invoice -> Invoice.getType(invoice.getInvoiceNumber()).equalsIgnoreCase(Invoice.InvoiceType.COMPLETE.name())).collect(Collectors.toList()); List<Invoice> completeInvoices = invoices.stream().filter(invoice -> Invoice.getType(invoice.getInvoiceNumber()).equalsIgnoreCase(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);
@ -174,7 +176,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(Invoice.getType(invoiceNumber).equalsIgnoreCase(Invoice.InvoiceType.PURCHASE.name()) ? PURCHASE_INVOICE_LOCATION : SHIPPING_INVOICE_LOCATION, invoiceNumber, invoiceEntity); List<Path> invoicePathList = shippingInvoiceService.getPath(Invoice.getType(invoiceNumber).equalsIgnoreCase(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()) {