diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/SettleOrderReport.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/SettleOrderReport.java
index ad601c80f..9c6a281b1 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/SettleOrderReport.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/SettleOrderReport.java
@@ -75,6 +75,11 @@ public class SettleOrderReport {
*/
private BigDecimal virtualAmount;
+ /**
+ * 结算金额
+ */
+ private BigDecimal settleAmount;
+
/**
* 交易日期
*/
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java
index 1c93918e6..5140db1f3 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java
@@ -1,6 +1,5 @@
package com.jsowell.pile.service.impl;
-import com.alibaba.fastjson2.JSON;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.google.common.base.Joiner;
@@ -693,6 +692,7 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService {
settleOrderReport.setServiceAmount(totalServiceAmount);
settleOrderReport.setTotalAmount(totalOrderAmount);
settleOrderReport.setVirtualAmount(totalVirtualAmount);
+ settleOrderReport.setSettleAmount(totalSettleAmount);
settleOrderReport.setTradeDate(tradeDate);
settleOrderReport.setOrderCodes(Joiner.on(",").join(orderCodeList));
// 计算手续费 = 结算金额 * 0.55%
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/SettleOrderReportVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/SettleOrderReportVO.java
index 2bcc4184f..7c4ad7d04 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/SettleOrderReportVO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/SettleOrderReportVO.java
@@ -1,6 +1,5 @@
package com.jsowell.pile.vo.web;
-import com.jsowell.common.annotation.Excel;
import lombok.Data;
import java.math.BigDecimal;
@@ -68,6 +67,11 @@ public class SettleOrderReportVO {
*/
private BigDecimal virtualAmount;
+ /**
+ * 结算金额
+ */
+ private BigDecimal settleAmount;
+
/**
* 交易日期
*/
diff --git a/jsowell-pile/src/main/resources/mapper/pile/SettleOrderReportMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/SettleOrderReportMapper.xml
index 5d2f3ca8a..f9b1505bc 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/SettleOrderReportMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/SettleOrderReportMapper.xml
@@ -16,6 +16,7 @@
+
@@ -26,7 +27,7 @@
id, settle_code, merchant_id, station_id, order_codes, use_electricity, charge_num,
- charge_time, electricity_amount, service_amount, total_amount, virtual_amount, trade_date,
+ charge_time, electricity_amount, service_amount, total_amount, virtual_amount, settle_amount, trade_date,
trade_amount, trade_fee, create_time, update_time, del_flag