From 2b040c77c59bc0011857969833849d22f6bf8c83 Mon Sep 17 00:00:00 2001 From: Lemon Date: Wed, 17 Jun 2026 15:52:33 +0800 Subject: [PATCH] =?UTF-8?q?update=20=20=E5=8F=96=E6=B6=88=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BusinessFinancialServiceImpl.java | 29 ++----------------- 1 file changed, 3 insertions(+), 26 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/BusinessFinancialServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/BusinessFinancialServiceImpl.java index 6752dac78..05f32d311 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/BusinessFinancialServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/BusinessFinancialServiceImpl.java @@ -208,17 +208,13 @@ public class BusinessFinancialServiceImpl implements BusinessFinancialService { FinancialScope scope = resolveFinancialScope(dto.getStationIdList()); List reportList = queryRawReports(scope.getStationIdList(), dto.getStartTime(), dto.getEndTime()); ReportSummary summary = buildReportSummary(reportList); - BigDecimal incomeTotalAmount = summary.getIncomeTotalAmount(); - BigDecimal merchantPlatformServiceFee = summary.getMerchantPlatformServiceFee(); - BigDecimal expenseTotalAmount = merchantPlatformServiceFee; List incomeItems = new ArrayList<>(); incomeItems.add(buildSettlementItem(SETTLEMENT_ITEM_SERVICE_FEE, "充电服务费（元）", summary.getChargeServiceFee())); incomeItems.add(buildSettlementItem(SETTLEMENT_ITEM_ELECTRICITY_FEE, "充电电费（元）", summary.getChargeElectricityFee())); - incomeItems.add(buildSettlementItem(SETTLEMENT_ITEM_PLATFORM_SUBSIDY, "平台给商户的服务费补贴（元）", summary.getPlatformServiceSubsidy())); - List expenseItems = new ArrayList<>(); - expenseItems.add(buildSettlementItem(SETTLEMENT_ITEM_MERCHANT_PLATFORM_FEE, "商户给平台的服务费（元）", merchantPlatformServiceFee)); + // List expenseItems = new ArrayList<>(); + // expenseItems.add(buildSettlementItem(SETTLEMENT_ITEM_MERCHANT_PLATFORM_FEE, "商户给平台的服务费（元）", merchantPlatformServiceFee)); return BusinessDailySettlementDetailVO.builder() .startTime(dto.getStartTime()) @@ -226,19 +222,15 @@ public class BusinessFinancialServiceImpl implements BusinessFinancialService { .merchantIdList(scope.getMerchantIdList()) .stationCount(scope.getStationIdList() != null ? scope.getStationIdList().size() : null) .settlementAmount(formatMoney(summary.getSettlementAmount())) - .incomeTotalAmount(formatMoney(incomeTotalAmount)) - .expenseTotalAmount(formatMoney(expenseTotalAmount)) .totalOrderCount(BigDecimalUtils.normalize(summary.getTotalOrderCount())) .orderTotalAmount(formatMoney(summary.getOrderTotalAmount())) .orderElectricity(formatQuantity(summary.getOrderElectricity())) .chargeServiceFee(formatMoney(summary.getChargeServiceFee())) .chargeElectricityFee(formatMoney(summary.getChargeElectricityFee())) - .platformServiceSubsidy(formatMoney(summary.getPlatformServiceSubsidy())) - .merchantPlatformServiceFee(formatMoney(merchantPlatformServiceFee)) .tradeAmount(formatMoney(summary.getTradeAmount())) .tradeFee(formatMoney(summary.getTradeFee())) .incomeItems(incomeItems) - .expenseItems(expenseItems) + // .expenseItems(expenseItems) .build(); } @@ -783,7 +775,6 @@ public class BusinessFinancialServiceImpl implements BusinessFinancialService { private BigDecimal orderElectricity = BigDecimal.ZERO; private BigDecimal chargeServiceFee = BigDecimal.ZERO; private BigDecimal chargeElectricityFee = BigDecimal.ZERO; - private BigDecimal platformServiceSubsidy = BigDecimal.ZERO; private BigDecimal settlementAmount = BigDecimal.ZERO; private BigDecimal tradeAmount = BigDecimal.ZERO; private BigDecimal tradeFee = BigDecimal.ZERO; @@ -799,7 +790,6 @@ public class BusinessFinancialServiceImpl implements BusinessFinancialService { orderElectricity = orderElectricity.add(BigDecimalUtils.nullToZero(report.getUseElectricity())); chargeServiceFee = chargeServiceFee.add(BigDecimalUtils.nullToZero(report.getServiceAmount())); chargeElectricityFee = chargeElectricityFee.add(BigDecimalUtils.nullToZero(report.getElectricityAmount())); - platformServiceSubsidy = platformServiceSubsidy.add(BigDecimalUtils.nullToZero(report.getVirtualAmount())); settlementAmount = settlementAmount.add(reportSettleAmount); tradeAmount = tradeAmount.add(BigDecimalUtils.nullToZero(report.getTradeAmount())); tradeFee = tradeFee.add(BigDecimalUtils.nullToZero(report.getTradeFee())); @@ -807,15 +797,6 @@ public class BusinessFinancialServiceImpl implements BusinessFinancialService { ? report.getTradeAmount() : reportSettleAmount); } - private BigDecimal getIncomeTotalAmount() { - return chargeServiceFee.add(chargeElectricityFee).add(platformServiceSubsidy); - } - - private BigDecimal getMerchantPlatformServiceFee() { - BigDecimal fee = getIncomeTotalAmount().subtract(settlementAmount); - return fee.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : fee; - } - private BigDecimal getOrderTotalAmount() { return orderTotalAmount; } @@ -836,10 +817,6 @@ public class BusinessFinancialServiceImpl implements BusinessFinancialService { return chargeElectricityFee; } - private BigDecimal getPlatformServiceSubsidy() { - return platformServiceSubsidy; - } - private BigDecimal getSettlementAmount() { return settlementAmount; }