From 91c08e4b0a2903b0e9c44e22a2d06d621ad77308 Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Wed, 16 Apr 2025 09:16:18 +0800
Subject: [PATCH] update

---
 .../com/jsowell/api/uniapp/customer/OrderController.java    | 2 +-
 .../java/com/jsowell/pile/domain/ChargeAlgorithmRecord.java | 4 ++--
 .../pile/service/impl/OrderSplitRecordServiceImpl.java      | 6 ++++++
 .../java/com/jsowell/pile/vo/web/SplitRecordInfoVO.java     | 5 +++++
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/OrderController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/OrderController.java
index c74894e9f..6622fe687 100644
--- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/OrderController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/OrderController.java
@@ -403,7 +403,7 @@ public class OrderController extends BaseController {
 		RestApiResponse<?> response = null;
 		try {
 			ChargeAlgorithmRecord record = chargeAlgorithmRecordService.queryRecordByOrderCode(orderCode);
-			response = new RestApiResponse<>(record);
+			response = new RestApiResponse<>(ImmutableMap.of("ChargeAlgorithmRecord", record));
 		} catch (Exception e) {
 			logger.error("查询电池充电报告 error, ", e);
 			response = new RestApiResponse<>(e);
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/ChargeAlgorithmRecord.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ChargeAlgorithmRecord.java
index c1d95a9b6..342ff9571 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/ChargeAlgorithmRecord.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ChargeAlgorithmRecord.java
@@ -122,13 +122,13 @@ public class ChargeAlgorithmRecord extends BaseEntity {
     /**
      * $column.columnComment
      */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @Excel(name = "最大允许电压告警", readConverterExp = "最大允许电压告警")
     private String maxAllowableVoltageAlarm;
 
     /**
      * $column.columnComment
      */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @Excel(name = "最大允许电流告警", readConverterExp = "最大允许电流告警")
     private String maxAllowableElectricityAlarm;
 
     /**
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java
index e491752ee..98a594385 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java
@@ -319,6 +319,12 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService {
                         .merchantName(orderSplitRecordVO.getMerchantName())
 
                         .build();
+                // 收入金额
+                BigDecimal subtract = orderSplitRecordVO.getElectricitySplitAmount()
+                        .add(orderSplitRecordVO.getServiceSplitAmount())
+                        .subtract(new BigDecimal(orderSplitRecordVO.getFeeAmount()));
+                orderSplit.setRevenueAmount(String.valueOf(subtract));
+
                 orderSplitList.add(orderSplit);
             }
             // 对 orderSplitList 进行排序，将当前登录用户的分账记录放在第一条
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/SplitRecordInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/SplitRecordInfoVO.java
index 2cf85a10c..fd30ce704 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/SplitRecordInfoVO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/SplitRecordInfoVO.java
@@ -77,6 +77,11 @@ public class SplitRecordInfoVO {
          */
         private String serviceSplitAmount;
 
+        /**
+         * 收入金额
+         */
+        private String revenueAmount;
+
         /**
          * 手续费
          */