From 48216377033f4c9abe4dd2f15d3738398fcc5b7c Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Thu, 27 Jul 2023 15:44:41 +0800 Subject: [PATCH] update --- .../main/java/com/jsowell/common/constant/Constants.java | 3 +++ .../pile/service/impl/OrderBasicInfoServiceImpl.java | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/jsowell-common/src/main/java/com/jsowell/common/constant/Constants.java b/jsowell-common/src/main/java/com/jsowell/common/constant/Constants.java index ac8df4293..c4cc67ac7 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/constant/Constants.java +++ b/jsowell-common/src/main/java/com/jsowell/common/constant/Constants.java @@ -17,6 +17,9 @@ public class Constants { // 充电桩枪口号长度 public static final int CONNECTOR_CODE_LENGTH = 2; + // 汇付手续费费率 + public static final String FEE_RATES = "0.0055"; + // 充电桩枪口编号长度 public static final int PILE_CONNECTOR_CODE_LENGTH = PILE_SN_LENGTH + CONNECTOR_CODE_LENGTH; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 4b86bb132..8ffaae8c8 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -2034,6 +2034,11 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { // 也许需要多笔支付订单才够退款 } + /** + * 计算站点订单报表 + * @param stationId 站点id + * @param tradeDate 交易日期 + */ @Override public void generateDailyOrderReports(String stationId, String tradeDate) { // logger.info("线程名===={}", Thread.currentThread().getName()); @@ -2135,7 +2140,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { settleOrderReport.setTradeDate(tradeDate); settleOrderReport.setOrderCodes(Joiner.on(",").join(orderCodeList)); // 计算手续费 = 结算金额 * 0.55% - BigDecimal tradeFee = totalSettleAmount.multiply(new BigDecimal("0.0055")); + BigDecimal tradeFee = totalSettleAmount.multiply(new BigDecimal(Constants.FEE_RATES)); settleOrderReport.setTradeFee(tradeFee); settleOrderReport.setTradeAmount(totalSettleAmount.subtract(tradeFee));