Merge pull request #563 from zhenxi-he/master

【fix】ERP：采购金额计算逻辑错误
YunaiV · Jun 22, 2024 · cd99a36 · cd99a36
2 parents da815e8 + cb1bf8c
commit cd99a36
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.../src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java b/.../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);
     }
 
-}
+}
diff --git a/.../main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseReturnServiceImpl.java b/.../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);
     }
 
-}
+}