From 66eb6a7fbdbae524a38b93cb7816c9470316651d Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Fri, 25 Jul 2025 16:18:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96orderSplitRecord=E4=B8=AD?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D=E8=AE=A1=E7=AE=97=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pile/service/impl/OrderBasicInfoServiceImpl.java | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
index 3fe015b77..84c7623b5 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
@@ -491,10 +491,16 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
         orderInfoDetailVO.setRefundAmount(orderBasicInfo.getRefundAmount());
         orderInfoDetailVO.setRefundStatus(orderBasicInfo.getRefundStatus());
         orderInfoDetailVO.setTotalUsedElectricity(orderDetail.getTotalUsedElectricity());
-        orderInfoDetailVO.setTotalOrderAmount(orderDetail.getTotalOrderAmount());
-        orderInfoDetailVO.setTotalElectricityAmount(orderDetail.getTotalElectricityAmount());
+        // 总订单金额
+        // orderInfoDetailVO.setTotalOrderAmount(orderDetail.getTotalOrderAmount());
+        orderInfoDetailVO.setTotalOrderAmount(orderBasicInfo.getSettleAmount()); // 使用订单主表中已经保留两位小数后的结算金额
+        // 总电费金额
+        // orderInfoDetailVO.setTotalElectricityAmount(orderDetail.getTotalElectricityAmount());
+        orderInfoDetailVO.setTotalElectricityAmount(orderDetail.getTotalElectricityAmount().setScale(2, RoundingMode.DOWN));
         orderInfoDetailVO.setDiscountElectricityAmount(orderDetail.getDiscountElectricityAmount());
-        orderInfoDetailVO.setTotalServiceAmount(orderDetail.getTotalServiceAmount());
+        // 总服务费金额
+        // orderInfoDetailVO.setTotalServiceAmount(orderDetail.getTotalServiceAmount());
+        orderInfoDetailVO.setTotalServiceAmount(orderInfoDetailVO.getTotalOrderAmount().subtract(orderDetail.getTotalElectricityAmount()));
         orderInfoDetailVO.setDiscountServiceAmount(orderDetail.getDiscountServiceAmount());
         orderInfoDetailVO.setSharpPrice(orderDetail.getSharpPrice());
         orderInfoDetailVO.setSharpUsedElectricity(orderDetail.getSharpUsedElectricity());