From ea52bec18daa9b15115978c8d4730a091c325287 Mon Sep 17 00:00:00 2001 From: wangy Date: Fri, 22 May 2026 15:28:17 +0800 Subject: [PATCH] =?UTF-8?q?feat(sip):bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/sip/service/impl/OmsPurchaseOrderServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPurchaseOrderServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPurchaseOrderServiceImpl.java index b2270038..feaa1638 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPurchaseOrderServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPurchaseOrderServiceImpl.java @@ -642,7 +642,7 @@ public class OmsPurchaseOrderServiceImpl implements IOmsPurchaseOrderService, To omsPurchaseOrder.setPayMethod(nexPayMethod); omsPurchaseOrder.setOwnerId(nexOwnerId); omsPurchaseOrder.setOwnerName(nexOwnerName); - omsPurchaseOrder.setTotalAmount(new BigDecimal(nexTotalAmount)); +// omsPurchaseOrder.setTotalAmount(new BigDecimal(nexTotalAmount)); omsPurchaseOrder.setStatus(OmsPurchaseOrder.StatusEnum.WAIT_COMPLETED.getCode()); // 0 omsPurchaseOrder.setApproveStatus(ApproveStatusEnum.WAIT_COMMIT.getCode()); // 0 @@ -665,6 +665,7 @@ public class OmsPurchaseOrderServiceImpl implements IOmsPurchaseOrderService, To // 税额 = 单价 * 数量 - (单价 * 数量) / (1 + 税率)，结果取两位小数 BigDecimal quantity = orderItem.getQuantity(); BigDecimal totalAmount = price.multiply(quantity); + omsPurchaseOrder.setTotalAmount(totalAmount); BigDecimal taxTotal = totalAmount.subtract(totalAmount.divide(BigDecimal.ONE.add(taxRate), 2, BigDecimal.ROUND_HALF_UP)); orderItem.setTaxTotal(taxTotal.setScale(2, BigDecimal.ROUND_HALF_UP)); // 根据传入的参数计算金额