From 548b45603d29e4427699a4e52a86b90e80f8f605 Mon Sep 17 00:00:00 2001
From: eric <465889110@qq.com>
Date: Mon, 8 Sep 2025 04:56:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=94=AF=E4=BB=98=E5=AE=9D?=
 =?UTF-8?q?=E9=80=80=E6=AC=BE=E9=87=91=E9=A2=9D=E4=B8=BAamount=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/api/DataPushApi.java       |  1 +
 .../main/java/com/ruoyi/orders/dto/RefundRequest.java  | 10 +++++++++-
 .../orders/service/impl/ZcOrderMainServiceImpl.java    |  8 +++++++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/DataPushApi.java b/ruoyi-admin/src/main/java/com/ruoyi/api/DataPushApi.java
index 4bba8d7..2ce1b6a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/DataPushApi.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/DataPushApi.java
@@ -132,6 +132,7 @@ public class DataPushApi {
             if (refundSub.getPaymentMethod().equals("WX_PAY")){
                 url = refundUrl;
             }else {
+                refundRequest.setRefundAmount(refundSub.getAmount().toString());
                 url = alirefundUrl;
             }
             ResponseEntity<String> response = restTemplate.postForEntity(url, requestEntity, String.class);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/orders/dto/RefundRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/orders/dto/RefundRequest.java
index 97cd97f..1edc79f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/orders/dto/RefundRequest.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/orders/dto/RefundRequest.java
@@ -12,7 +12,7 @@ public class RefundRequest {
     private BigDecimal totalFee;     // 订单金额(分)
     private BigDecimal refundFee;    // 退款金额(分)
     private String refundDesc;    // 退款原因
-
+    private String refundAmount;  //支付宝退款
     // 构造函数
     public RefundRequest() {}
 
@@ -64,4 +64,12 @@ public class RefundRequest {
     public void setRefundDesc(String refundDesc) {
         this.refundDesc = refundDesc;
     }
+
+    public String getRefundAmount() {
+        return refundAmount;
+    }
+
+    public void setRefundAmount(String refundAmount) {
+        this.refundAmount = refundAmount;
+    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/orders/service/impl/ZcOrderMainServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/orders/service/impl/ZcOrderMainServiceImpl.java
index 8c2c446..7b84396 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/orders/service/impl/ZcOrderMainServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/orders/service/impl/ZcOrderMainServiceImpl.java
@@ -204,6 +204,11 @@ public class ZcOrderMainServiceImpl implements IZcOrderMainService
         depositSub.setSuborderType(OrderUtil.DEPOSIT);
         ZcOrderSub querySub = zcOrderSubService.selectZcOrderSub(depositSub);
 
+        ZcOrderSub battreySub = new ZcOrderSub();
+        battreySub.setOrderId(orderId);
+        battreySub.setSuborderType(OrderUtil.RENTBATTEY);
+        ZcOrderSub queryBattreySub = zcOrderSubService.selectZcOrderSub(depositSub);
+
         if (querySub != null) {
 
             ZcOrderMain queryMain = selectZcOrderMainByOrderId(orderId);
@@ -217,7 +222,8 @@ public class ZcOrderMainServiceImpl implements IZcOrderMainService
             refundSub.setSuborderType(OrderUtil.FD_DEPOSIT);
             // 如果租车订单未取车，退租车费用和押金费用
             if(queryMain.getOrderStatus().equals(OrderStatusEnum.WAIT_PICK.getCode())){
-                refundSub.setAmount(queryOrder.getDepositPrice().add(queryOrder.getRentalPrice()));
+                // 退押金和租车费用和租电费用
+                refundSub.setAmount(queryOrder.getDepositPrice().add(queryOrder.getRentalPrice().add(queryBattreySub.getAmount())));
             }else {
                 // 计算实际退款金额（押金减去逾期费用）
                 BigDecimal overdueAmount = BigDecimal.ZERO;