From 3941e790b6f9cc99027fae31a51de64ec5fb6a58 Mon Sep 17 00:00:00 2001
From: zhenxi-he <zhenxi_he@hotmail.com>
Date: Tue, 18 Jun 2024 09:50:14 +0800
Subject: [PATCH 1/2] Update ErpPurchaseInServiceImpl.java

---
 .../module/erp/service/purchase/ErpPurchaseInServiceImpl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java
index 58f4952081..a0017aed64 100644
--- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java
+++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java
@@ -140,7 +140,7 @@ private void calculateTotalPrice(ErpPurchaseInDO purchaseIn, List<ErpPurchaseInI
             purchaseIn.setDiscountPercent(BigDecimal.ZERO);
         }
         purchaseIn.setDiscountPrice(MoneyUtils.priceMultiplyPercent(purchaseIn.getTotalPrice(), purchaseIn.getDiscountPercent()));
-        purchaseIn.setTotalPrice(purchaseIn.getTotalPrice().subtract(purchaseIn.getDiscountPrice().add(purchaseIn.getOtherPrice())));
+        purchaseIn.setTotalPrice(purchaseIn.getTotalPrice().subtract(purchaseIn.getDiscountPrice()).add(purchaseIn.getOtherPrice()));
     }
 
     private void updatePurchaseOrderInCount(Long orderId) {
@@ -305,4 +305,4 @@ public List<ErpPurchaseInItemDO> getPurchaseInItemListByInIds(Collection<Long> i
         return purchaseInItemMapper.selectListByInIds(inIds);
     }
 
-}
\ No newline at end of file
+}

From cb1bf8c91a3e12866780eae176ad721a28b015dc Mon Sep 17 00:00:00 2001
From: zhenxi-he <zhenxi_he@hotmail.com>
Date: Tue, 18 Jun 2024 09:51:18 +0800
Subject: [PATCH 2/2] Update ErpPurchaseReturnServiceImpl.java

---
 .../erp/service/purchase/ErpPurchaseReturnServiceImpl.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseReturnServiceImpl.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseReturnServiceImpl.java
index 6648825b32..00527cb997 100644
--- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseReturnServiceImpl.java
+++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseReturnServiceImpl.java
@@ -136,7 +136,7 @@ private void calculateTotalPrice(ErpPurchaseReturnDO purchaseReturn, List<ErpPur
             purchaseReturn.setDiscountPercent(BigDecimal.ZERO);
         }
         purchaseReturn.setDiscountPrice(MoneyUtils.priceMultiplyPercent(purchaseReturn.getTotalPrice(), purchaseReturn.getDiscountPercent()));
-        purchaseReturn.setTotalPrice(purchaseReturn.getTotalPrice().subtract(purchaseReturn.getDiscountPrice().add(purchaseReturn.getOtherPrice())));
+        purchaseReturn.setTotalPrice(purchaseReturn.getTotalPrice().subtract(purchaseReturn.getDiscountPrice()).add(purchaseReturn.getOtherPrice()));
     }
 
     private void updatePurchaseOrderReturnCount(Long orderId) {
@@ -301,4 +301,4 @@ public List<ErpPurchaseReturnItemDO> getPurchaseReturnItemListByReturnIds(Collec
         return purchaseReturnItemMapper.selectListByReturnIds(returnIds);
     }
 
-}
\ No newline at end of file
+}