From 772045c89c15d8a86bf7bec5b0c5a61efd16e84f Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Wed, 22 Jan 2025 15:34:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E4=B8=AD=E5=BF=83-=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E4=BB=96=E4=BA=BA=E5=88=86=E8=B4=A6=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SettleOrderReportServiceImpl.java  | 13 +++++++++----
 .../com/jsowell/pile/vo/web/OrderReportDetail.java  |  4 ++++
 2 files changed, 13 insertions(+), 4 deletions(-)

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 1b698a00b..e501a2001 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
@@ -24,7 +24,6 @@ import com.jsowell.pile.dto.GetClearingBillDTO;
 import com.jsowell.pile.dto.MerchantOrderReportDTO;
 import com.jsowell.pile.dto.QueryOrderDTO;
 import com.jsowell.pile.dto.SettleOrderReportDTO;
-import com.jsowell.pile.mapper.AdapayCallbackRecordMapper;
 import com.jsowell.pile.mapper.OrderBasicInfoMapper;
 import com.jsowell.pile.mapper.SettleOrderReportMapper;
 import com.jsowell.pile.service.*;
@@ -62,9 +61,6 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService {
     @Autowired
     private PileStationInfoService pileStationInfoService;
 
-    @Autowired
-    private AdapayCallbackRecordMapper adapayCallbackRecordMapper;
-
     @Autowired
     private AdapayService adapayService;
 
@@ -77,6 +73,9 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService {
     @Autowired
     private ClearingBillInfoService clearingBillInfoService;
 
+    @Autowired
+    private OrderSplitRecordService orderSplitRecordService;
+
 
     /**
      * 查询结算订单报
@@ -458,6 +457,12 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService {
         report.setTradeAmount(tradeAmount);
         // 交易手续费
         report.setTradeFee(tradeFee);
+
+        // 获取他人分账金额
+        List<OrderSplitDailySummaryData> orderSplitDailySummaryData = orderSplitRecordService.queryOrderSplitData(dto.getMerchantId(), null, dto.getStartTime(), dto.getEndTime());
+        if (!CollectionUtils.isEmpty(orderSplitDailySummaryData)) {
+            report.setOtherSplitAmount(orderSplitDailySummaryData.stream().map(OrderSplitDailySummaryData::getOtherSplitAmount).reduce(BigDecimal.ZERO, BigDecimal::add));
+        }
         return report;
     }
 
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderReportDetail.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderReportDetail.java
index 8dd874a3a..0c0c9e624 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderReportDetail.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderReportDetail.java
@@ -38,4 +38,8 @@ public class OrderReportDetail {
 
     // 白名单支付次数
     private BigDecimal whitelistPaymentsNum;
+
+    // 他人分账金额
+    private BigDecimal otherSplitAmount;
+
 }