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

bugfix 财务中心无手续费等费用、分账订单流水重复

Browse Source
This commit is contained in:
Lemon
2025-08-08 13:51:26 +08:00
parent 0de268c679
commit 97d1ac2f34
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java
View File

@@ -212,7 +212,7 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService {
BigDecimal totalFeeAmount = BigDecimal.ZERO; // 当天手续费金额 BigDecimal totalFeeAmount = BigDecimal.ZERO; // 当天手续费金额
// 如果没有查询到订单分账记录, 进入下一个循环 // 如果没有查询到订单分账记录, 进入下一个循环
if (CollectionUtils.isNotEmpty(orderCodeSet)) { if (CollectionUtils.isEmpty(orderCodeSet)) {
summaryData.setOtherSplitDetailList(Lists.newArrayList()); summaryData.setOtherSplitDetailList(Lists.newArrayList());
summaryData.setTotalSettleAmount(totalSettleAmount); summaryData.setTotalSettleAmount(totalSettleAmount);
summaryData.setMerchantSplitAmount(totalMerchantSplitAmount); summaryData.setMerchantSplitAmount(totalMerchantSplitAmount);

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

@@ -455,6 +455,7 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService {
// 获取他人分账金额 // 获取他人分账金额
List<OrderSplitDailySummaryData> orderSplitDailySummaryData = orderSplitRecordService.queryOrderSplitData(dto.getMerchantId(), null, dto.getStartTime(), dto.getEndTime()); List<OrderSplitDailySummaryData> orderSplitDailySummaryData = orderSplitRecordService.queryOrderSplitData(dto.getMerchantId(), null, dto.getStartTime(), dto.getEndTime());
log.info("orderSplitDailySummaryData: {}", orderSplitDailySummaryData);
if (!CollectionUtils.isEmpty(orderSplitDailySummaryData)) { if (!CollectionUtils.isEmpty(orderSplitDailySummaryData)) {
report.setOtherSplitAmount(orderSplitDailySummaryData.stream().map(OrderSplitDailySummaryData::getOtherSplitAmount).reduce(BigDecimal.ZERO, BigDecimal::add)); report.setOtherSplitAmount(orderSplitDailySummaryData.stream().map(OrderSplitDailySummaryData::getOtherSplitAmount).reduce(BigDecimal.ZERO, BigDecimal::add));

3
jsowell-pile/src/main/resources/mapper/pile/ClearingWithdrawInfoMapper.xml
View File

@@ -539,8 +539,7 @@
</select> </select>
<select id="selectWithdrawInfoByOrderCodeList" resultType="com.jsowell.pile.vo.web.ClearingBillVO"> <select id="selectWithdrawInfoByOrderCodeList" resultType="com.jsowell.pile.vo.web.ClearingBillVO">
select select DINSTINCT(t1.clearing_bill_code) as clearingBillCode,
t1.clearing_bill_code as clearingBillCode,
t2.order_code as orderCode, t2.order_code as orderCode,
t5.settle_amount as settleAmount, t5.settle_amount as settleAmount,
t3.withdraw_code as withdrawCode, t3.withdraw_code as withdrawCode,