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 = 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; + }