diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/PurchaseOrderController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/PurchaseOrderController.java index cb3c6f1dd..bea6b8e16 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/PurchaseOrderController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/PurchaseOrderController.java @@ -217,7 +217,7 @@ public class PurchaseOrderController { List platformOrderIds = new ArrayList<>(Arrays.asList(purchaseOrderPage.getPlatformOrderId().split(","))); log.info("Editing purchase order and attributing it to orders : {}", platformOrderIds); log.info("Removing previous attribution to orders"); - platformOrderService.removePurchaseInvoiceNumber(purchaseOrder.getInvoiceNumber()); + platformOrderService.removePurchaseInvoiceNumber(purchaseOrder.getInvoiceNumber(), purchaseOrder.getClientId()); List platformOrders = platformOrderService.selectByPlatformOrderIds(platformOrderIds); log.info("Platform orders found for attribution : {}", platformOrders.stream().map(PlatformOrder::getPlatformOrderId).collect(Collectors.toList())); Map> platformOrderIdUpdateMap = new HashMap<>(); @@ -242,7 +242,7 @@ public class PurchaseOrderController { /** * 通过id删除 - * + * not used, use cancelInvoice instead * @param id * @return */ @@ -261,7 +261,7 @@ public class PurchaseOrderController { /** * 批量删除 - * + * not used, use cancelBatchInvoice instead * @param ids * @return */ diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/Client.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/Client.java index f4826d165..687f33870 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/Client.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/Client.java @@ -31,7 +31,7 @@ public class Client implements Serializable { /** * 主键 */ - @TableId(type = IdType.ASSIGN_ID) + @TableId(type = IdType.ASSIGN_UUID) @ApiModelProperty(value = "主键") private java.lang.String id; /** diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/PurchaseOrder.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/PurchaseOrder.java index d92d3e5e8..5abb4fb0c 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/PurchaseOrder.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/PurchaseOrder.java @@ -30,7 +30,7 @@ public class PurchaseOrder implements Serializable { /** * 主键 */ - @TableId(type = IdType.ASSIGN_ID) + @TableId(type = IdType.ASSIGN_UUID) @ApiModelProperty(value = "主键") private String id; /** diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/PlatformOrderContentMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/PlatformOrderContentMapper.java index 9b3996cc2..6ff642e20 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/PlatformOrderContentMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/PlatformOrderContentMapper.java @@ -76,7 +76,7 @@ public interface PlatformOrderContentMapper extends BaseMapper findUninvoicedShippedOrderContents(); List fetchPlatformOrderContentsToArchive(@Param("orderIDs") List orderIDs); void insertPlatformOrderContentsArchives(@Param("orderContents") List platformOrderContents); - void cancelInvoice(@Param("invoiceNumber") String invoiceNumber); + void cancelInvoice(@Param("invoiceNumber") String invoiceNumber, @Param("clientId") String clientId); void cancelBatchInvoice(@Param("invoiceNumbers") List invoiceNumbers); List searchSkuPrice(@Param("skuIds") List skuIds); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/PlatformOrderMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/PlatformOrderMapper.java index b29f0281c..8bd6e996e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/PlatformOrderMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/PlatformOrderMapper.java @@ -186,7 +186,7 @@ public interface PlatformOrderMapper extends BaseMapper { List fetchOrdersToArchiveBetweenDate(@Param("startDate") String startDate, @Param("endDate") String endDate); List fetchOrdersToArchiveBeforeDate(@Param("endDate") String endDate); void insertPlatformOrdersArchives(@Param("orders") List platformOrders); - void cancelInvoice(@Param("invoiceNumber") String invoiceNumber); + void cancelInvoice(@Param("invoiceNumber") String invoiceNumber, @Param("clientId") String clientId); void cancelBatchInvoice(@Param("invoiceNumbers") List invoiceNumbers); List findUninvoicedShippingOrdersByShopForClient(@Param("shopIds") List shopIds, @Param("erpStatuses") List erpStatuses); @@ -206,7 +206,7 @@ public interface PlatformOrderMapper extends BaseMapper { List selectByPlatformOrderIds(@Param("platformOrderIds") List platformOrderIds); - void removePurchaseInvoiceNumber(@Param("invoiceNumber") String purchaseInvoiceNumber); + void removePurchaseInvoiceNumber(@Param("invoiceNumber") String purchaseInvoiceNumber, @Param("clientId") String clientId); void removePurchaseInvoiceNumbers(@Param("invoiceNumbers") List invoiceNumbers); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/PurchaseOrderMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/PurchaseOrderMapper.java index 35fc8b14a..079fabe8b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/PurchaseOrderMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/PurchaseOrderMapper.java @@ -102,7 +102,7 @@ public interface PurchaseOrderMapper extends BaseMapper { BigDecimal getPurchaseFeesByInvoiceCode(@Param("invoiceCode") String invoiceCode); - void deleteInvoice(@Param("invoiceNumber") String invoiceNumber); + void deleteInvoice(@Param("invoiceNumber") String invoiceNumber, @Param("clientId") String clientId); void deleteBatchInvoice(@Param("invoiceNumbers") List invoiceNumbers); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/SavRefundMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/SavRefundMapper.java index 2642cb9fb..8080389a3 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/SavRefundMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/SavRefundMapper.java @@ -17,6 +17,6 @@ import java.util.List; @Repository public interface SavRefundMapper extends BaseMapper { List fetchRefundAmount(@Param("invoiceNumber") String invoiceNumber); - void cancelInvoice(@Param("invoiceNumber") String invoiceNumber); + void cancelInvoice(@Param("invoiceNumber") String invoiceNumber, @Param("clientId") String clientId); void cancelBatchInvoice(@Param("invoiceNumbers") List invoiceNumbers); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderContentMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderContentMapper.xml index fd13bc2cc..0d7681bb5 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderContentMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderContentMapper.xml @@ -298,6 +298,8 @@ UPDATE platform_order_content poc JOIN platform_order po ON poc.platform_order_id = po.id JOIN shipping_invoice si ON po.shipping_invoice_number = si.invoice_number + JOIN shop s ON po.shop_id = s.id + JOIN client c ON s.owner_id = c.id SET poc.picking_fee = 0.0, poc.shipping_fee = NULL, poc.service_fee = NULL, @@ -309,7 +311,8 @@ WHEN poc.erp_status = '2' AND si.create_by = 'system' THEN '1' ELSE poc.erp_status END - WHERE po.shipping_invoice_number = #{invoiceNumber}; + WHERE po.shipping_invoice_number = #{invoiceNumber} + AND c.id = #{clientId}; UPDATE platform_order_content diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderMapper.xml index b91711386..0db60aa52 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderMapper.xml @@ -726,18 +726,21 @@ UPDATE platform_order po JOIN shipping_invoice si ON po.shipping_invoice_number = si.invoice_number - SET fret_fee = NULL, - order_service_fee = NULL, - shipping_invoice_number = NULL, - picking_fee = 0.0, - packaging_material_fee = 0.0, - erp_status = + JOIN shop s ON po.shop_id = s.id + JOIN client c ON s.owner_id = c.id + SET po.fret_fee = NULL, + po.order_service_fee = NULL, + po.shipping_invoice_number = NULL, + po.picking_fee = 0.0, + po.packaging_material_fee = 0.0, + po.erp_status = CASE WHEN erp_status = '4' THEN '3' WHEN erp_status = '2' AND si.create_by = 'system' THEN '1' ELSE erp_status END - WHERE shipping_invoice_number = #{invoiceNumber}; + WHERE shipping_invoice_number = #{invoiceNumber} + AND c.id = #{clientId}; UPDATE platform_order @@ -806,8 +809,11 @@ UPDATE platform_order + JOIN shop s ON platform_order.shop_id = s.id + JOIN client c ON s.owner_id = c.id SET purchase_invoice_number = NULL WHERE purchase_invoice_number = #{invoiceNumber} + AND c.id = #{clientId}; UPDATE platform_order diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PurchaseOrderMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PurchaseOrderMapper.xml index 9ac3d57b0..aad5ddbcd 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PurchaseOrderMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PurchaseOrderMapper.xml @@ -73,6 +73,7 @@ DELETE FROM purchase_order WHERE invoice_number = #{invoiceNumber} + AND purchase_order.client_id = #{clientId} DELETE diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SavRefundMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SavRefundMapper.xml index 8631c4732..132d39d90 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SavRefundMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SavRefundMapper.xml @@ -8,10 +8,14 @@ UPDATE sav_refund + JOIN platform_order po ON sav_refund.platform_order_id = po.id + JOIN shop s ON po.shop_id = s.id + JOIN client c ON s.owner_id = c.id SET invoice_number = NULL, refund_date = NULL, total_refund_amount = 0.0 - WHERE invoice_number = #{invoiceNumber}; + WHERE invoice_number = #{invoiceNumber} + AND c.id = #{clientId}; UPDATE sav_refund diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IPlatformOrderContentService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IPlatformOrderContentService.java index bd56e049d..73ce223e9 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IPlatformOrderContentService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IPlatformOrderContentService.java @@ -49,7 +49,7 @@ public interface IPlatformOrderContentService extends IService { * Cancel Invoice * @param invoiceNumber */ - void cancelInvoice(String invoiceNumber); + void cancelInvoice(String invoiceNumber, String clientId); /** * Cancel Invoice * @param invoiceNumbers @@ -229,7 +229,7 @@ public interface IPlatformOrderService extends IService { List selectByPlatformOrderIds(List platformOrderIds); - void removePurchaseInvoiceNumber(String purchaseInvoiceNumber); + void removePurchaseInvoiceNumber(String purchaseInvoiceNumber, String clientId); void removePurchaseInvoiceNumbers(List invoiceNumbers); void updatePurchaseInvoiceNumber(List orderIds, String invoiceCode); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IPurchaseOrderService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IPurchaseOrderService.java index ba3b0beda..148b67990 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IPurchaseOrderService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IPurchaseOrderService.java @@ -112,7 +112,7 @@ public interface IPurchaseOrderService extends IService { BigDecimal getPurchaseFeesByInvoiceCode(String invoiceCode); - void cancelInvoice(String invoiceNumber); + void cancelInvoice(String invoiceNumber, String clientId); void cancelBatchInvoice(List invoiceNumbers); @@ -134,8 +134,6 @@ public interface IPurchaseOrderService extends IService { void setPaid(List invoiceNumbers); - void deleteInvoice(String invoiceNumber); - PurchaseOrder getPurchaseByInvoiceNumberAndClientId(String invoiceNumber, String clientId); List getPurchasesByInvoices(List invoices); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISavRefundService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISavRefundService.java index 5c414703a..5ecb033f2 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISavRefundService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISavRefundService.java @@ -18,7 +18,7 @@ public interface ISavRefundService extends IService { * Cancel Invoice * @param invoiceNumber */ - void cancelInvoice(String invoiceNumber); + void cancelInvoice(String invoiceNumber, String clientId); /** * Cancel Batch Invoice * @param invoiceNumbers 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 9ab53fe88..055e6a9a0 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 @@ -31,8 +31,6 @@ public class InvoiceServiceImpl extends ServiceImpl impl @Autowired private IPlatformOrderService platformOrderService; @Autowired - private PurchaseOrderContentMapper purchaseOrderContentMapper; - @Autowired private IPurchaseOrderService purchaseOrderService; @Autowired private ISavRefundService savRefundService; @@ -59,18 +57,19 @@ public class InvoiceServiceImpl extends ServiceImpl impl public boolean cancelInvoice(String id, String invoiceNumber, String clientId) { String invoiceEntity = clientService.getById(clientId).getInvoiceEntity(); + savRefundService.cancelInvoice(invoiceNumber, clientId); if(Invoice.getType(invoiceNumber).equalsIgnoreCase(PURCHASE.name())) { PurchaseOrder po = purchaseOrderService.getById(id); if (po.getInventoryDocumentString() != null && !po.getInventoryDocumentString().isEmpty()) shippingInvoiceService.deleteAttachmentFile(po.getInventoryDocumentString()); if (po.getPaymentDocumentString() != null && !po.getPaymentDocumentString().isEmpty()) shippingInvoiceService.deleteAttachmentFile(po.getPaymentDocumentString()); - platformOrderService.removePurchaseInvoiceNumber(invoiceNumber); - purchaseOrderService.deleteInvoice(invoiceNumber); + platformOrderService.removePurchaseInvoiceNumber(invoiceNumber, clientId); + purchaseOrderService.delMain(id); } if(Invoice.getType(invoiceNumber).equalsIgnoreCase(SHIPPING.name())) { - platformOrderContentService.cancelInvoice(invoiceNumber); - platformOrderService.cancelInvoice(invoiceNumber); + platformOrderContentService.cancelInvoice(invoiceNumber, clientId); + platformOrderService.cancelInvoice(invoiceNumber, clientId); shippingInvoiceService.delMain(id); } if(Invoice.getType(invoiceNumber).equalsIgnoreCase(COMPLETE.name())) { @@ -79,13 +78,12 @@ public class InvoiceServiceImpl extends ServiceImpl impl 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); + platformOrderContentService.cancelInvoice(invoiceNumber, clientId); + platformOrderService.removePurchaseInvoiceNumber(invoiceNumber, clientId); + platformOrderService.cancelInvoice(invoiceNumber, clientId); + purchaseOrderService.delMain(purchase.getId()); shippingInvoiceService.delMain(id); } - savRefundService.cancelInvoice(invoiceNumber); log.info("Updating balance ..."); balanceService.deleteBalance(id, Balance.OperationType.Debit.name()); @@ -117,12 +115,10 @@ public class InvoiceServiceImpl extends ServiceImpl impl shippingInvoiceService.deleteAttachmentFile(po.getPaymentDocumentString()); } platformOrderService.removePurchaseInvoiceNumbers(purchaseInvoiceNumbers); - purchaseOrderService.cancelBatchInvoice(purchaseInvoiceNumbers); - purchaseOrderContentMapper.deleteFromPurchaseIds(ids); + purchaseOrderService.delBatchMain(ids); savRefundService.cancelBatchInvoice(purchaseInvoiceNumbers); log.info("Updating balances ..."); balanceService.deleteBatchBalance(ids, Balance.OperationType.Debit.name()); - } if(!shippingInvoiceNumbers.isEmpty()) { List ids = invoices.stream().filter(invoice -> Invoice.getType(invoice.getInvoiceNumber()).equalsIgnoreCase(SHIPPING.name())).map(Invoice::getId).collect(Collectors.toList()); @@ -132,7 +128,6 @@ public class InvoiceServiceImpl extends ServiceImpl impl shippingInvoiceService.delBatchMain(ids); log.info("Updating balances ..."); balanceService.deleteBatchBalance(ids, Balance.OperationType.Debit.name()); - } if(!completeInvoiceNumbers.isEmpty()) { List completeInvoices = invoices.stream().filter(invoice -> Invoice.getType(invoice.getInvoiceNumber()).equalsIgnoreCase(COMPLETE.name())).collect(Collectors.toList()); @@ -144,7 +139,7 @@ public class InvoiceServiceImpl extends ServiceImpl impl //purchase cancel List purchaseOrders = purchaseOrderService.getPurchasesByInvoices(completeInvoices); - + List purchaseIds = purchaseOrders.stream().map(PurchaseOrder::getId).collect(Collectors.toList()); for(PurchaseOrder po : purchaseOrders) { if(po.getInventoryDocumentString() != null && !po.getInventoryDocumentString().isEmpty()) shippingInvoiceService.deleteAttachmentFile(po.getInventoryDocumentString()); @@ -152,8 +147,7 @@ public class InvoiceServiceImpl extends ServiceImpl impl shippingInvoiceService.deleteAttachmentFile(po.getPaymentDocumentString()); } platformOrderService.removePurchaseInvoiceNumbers(completeInvoiceNumbers); - purchaseOrderService.cancelBatchInvoice(completeInvoiceNumbers); - purchaseOrderContentMapper.deleteFromPurchaseIds(ids); + purchaseOrderService.delBatchMain(purchaseIds); savRefundService.cancelBatchInvoice(completeInvoiceNumbers); log.info("Updating balances ..."); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/PlatformOrderContentServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/PlatformOrderContentServiceImpl.java index 0e1345b21..634f71776 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/PlatformOrderContentServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/PlatformOrderContentServiceImpl.java @@ -64,8 +64,8 @@ public class PlatformOrderContentServiceImpl extends ServiceImpl invoiceNumbers) { diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/PlatformOrderServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/PlatformOrderServiceImpl.java index 04e278b1f..8e8d0b123 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/PlatformOrderServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/PlatformOrderServiceImpl.java @@ -410,8 +410,8 @@ public class PlatformOrderServiceImpl extends ServiceImpl invoiceNumbers) { @@ -463,8 +463,8 @@ public class PlatformOrderServiceImpl extends ServiceImpl invoiceNumbers) { diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/purchase/PurchaseOrderServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/purchase/PurchaseOrderServiceImpl.java index ead0f4909..0d3d21eb8 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/purchase/PurchaseOrderServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/purchase/PurchaseOrderServiceImpl.java @@ -138,23 +138,18 @@ public class PurchaseOrderServiceImpl extends ServiceImpl idList) { for (Serializable id : idList) { - String invoiceNumber = purchaseOrderMapper.getInvoiceNumber(id.toString()); purchaseOrderContentMapper.deleteByMainId(id.toString()); skuPromotionHistoryMapper.deleteByMainId(id.toString()); purchaseOrderMapper.deleteById(id); - platformOrderService.removePurchaseInvoiceNumber(invoiceNumber); } } @@ -572,8 +567,8 @@ public class PurchaseOrderServiceImpl extends ServiceImpl