From 66add9fecfbcc81ed179969b0cc81834ac64074e Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Fri, 5 Sep 2025 15:06:36 +0800
Subject: [PATCH] =?UTF-8?q?update=20=20=E6=94=AF=E4=BB=98=E5=9B=9E?=
 =?UTF-8?q?=E8=B0=83=E4=B8=AD=E5=88=A4=E6=96=AD=E8=AE=A2=E5=8D=95=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E8=B4=AD=E4=B9=B0=E4=BF=9D=E9=99=A9=EF=BC=8C=E5=A6=82?=
 =?UTF-8?q?=E6=9E=9C=E8=B4=AD=E4=B9=B0=EF=BC=8C=E5=B0=86=E5=90=AF=E5=8A=A8?=
 =?UTF-8?q?=E5=85=85=E7=94=B5=E9=87=91=E9=A2=9D=E5=87=8F=E5=8E=BB=E4=BF=9D?=
 =?UTF-8?q?=E9=99=A9=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/jsowell/service/OrderService.java  | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
index 0cf63bfd7..4bdf5a19a 100644
--- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
@@ -146,6 +146,9 @@ public class OrderService {
     @Autowired
     private PersonalChargingRecordService personalChargingRecordService;
 
+    @Autowired
+    private IOrderInsuranceInfoService orderInsuranceInfoService;
+
     // 引入线程池
     private ThreadPoolTaskExecutor executor = SpringUtils.getBean("threadPoolTaskExecutor");
 
@@ -1205,10 +1208,17 @@ public class OrderService {
                 }
             }, executor);
 
+            BigDecimal chargeAmount = BigDecimal.ZERO;
+            OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode);
+            BigDecimal insuranceAmount = orderBasicInfo.getInsuranceAmount();
+            if (insuranceAmount != null) {
+                // 如果用户支付了保险金额，则充电金额需将保险金额减去
+                chargeAmount = amount.divide(insuranceAmount).setScale(2, RoundingMode.HALF_UP);
+            }
             // 支付订单成功
             PayOrderSuccessCallbackDTO callbackDTO = PayOrderSuccessCallbackDTO.builder()
                     .orderCode(orderCode)
-                    .payAmount(amount)
+                    .payAmount(chargeAmount)
                     // .payMode(OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue())
                     .payMode(payModel)
                     .acquirer(AcquirerEnum.ADAPAY.getValue())