autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-19 18:45:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

财务中心-获取他人分账金额

Browse Source
This commit is contained in:
Guoqs
2025-01-22 15:34:50 +08:00
parent 031f9cd98f
commit 772045c89c
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java
View File

@@ -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;
}

4
jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderReportDetail.java
View File

@@ -38,4 +38,8 @@ public class OrderReportDetail {
// 白名单支付次数
private BigDecimal whitelistPaymentsNum;
// 他人分账金额
private BigDecimal otherSplitAmount;
}