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 56d33b383..be1ceac70 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 @@ -424,19 +424,17 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService { chargeTime = chargeTime.add(new BigDecimal(settleOrderReportVO.getChargeTime())); electricityAmount = electricityAmount.add(settleOrderReportVO.getElectricityAmount()); serviceAmount = serviceAmount.add(settleOrderReportVO.getServiceAmount()); + // 2024年11月12日14点30分使用结算金额计算收入金额 BigDecimal amount = settleOrderReportVO.getSettleAmount() != null ? settleOrderReportVO.getSettleAmount() : settleOrderReportVO.getTotalAmount(); // 2025年6月19日15点11分 修改逻辑, 使用实收金额进行计算 - - totalAmount = totalAmount.add(amount); virtualAmount = virtualAmount.add(settleOrderReportVO.getVirtualAmount()); } - // 从清分账单中计算交易金额,交易手续费 GetClearingBillDTO clearingBillDTO = GetClearingBillDTO.builder() .merchantId(dto.getMerchantId()) @@ -448,12 +446,6 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService { BigDecimal tradeAmount = BigDecimal.ZERO; BigDecimal tradeFee = BigDecimal.ZERO; - // List merchantClearingBillList = clearingBillInfoService.getMerchantClearingBillList(clearingBillDTO); - // for (MerchantClearingBillVO merchantClearingBillVO : merchantClearingBillList) { - // tradeAmount = tradeAmount.add(new BigDecimal(merchantClearingBillVO.getWithdrawAbleAmount())); - // tradeFee = tradeFee.add(new BigDecimal(merchantClearingBillVO.getFeeAmount())); - // } - // 获取他人分账金额 List orderSplitDailySummaryData = orderSplitRecordService.queryOrderSplitData(dto.getMerchantId(), null, dto.getStartTime(), dto.getEndTime()); log.info("orderSplitDailySummaryData: {}", orderSplitDailySummaryData); @@ -463,6 +455,7 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService { // 2025年7月14日15点22分 从order_split_record表中计算订单分账金额 tradeAmount = orderSplitDailySummaryData.stream().map(OrderSplitDailySummaryData::getMerchantSplitAmount) .reduce(BigDecimal.ZERO, BigDecimal::add); + tradeFee = orderSplitDailySummaryData.stream().map(OrderSplitDailySummaryData::getMerchantFeeAmount) .reduce(BigDecimal.ZERO, BigDecimal::add); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java index b5d976b9c..ac7a4f5e3 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java @@ -543,12 +543,6 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic { return; } - // 获取更新数据后的orderBasicInfo对象 - // returnUpdateOrderBasicInfo(orderBasicInfo, data); - - // 获取更新数据后的orderDetail对象/更新订单详情 查询订单详情 修改订单数据 - // OrderDetail orderDetail = returnUpdateOrderDetail(orderBasicInfo, data); - // 查询订单详情 OrderDetail orderDetail = orderBasicInfoService.getOrderDetailByOrderCode(orderBasicInfo.getOrderCode());