From 8ce373e69f2f0e79f479cf745369d38cb1191a73 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期四, 20 三月 2025 15:58:49 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java index a5562a3..15274c2 100644 --- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java +++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java @@ -1111,9 +1111,9 @@ BigDecimal periodElectricPrice = collect.stream().map(TChargingOrderAccountingStrategy::getPeriodElectricPrice).reduce(BigDecimal.ZERO, BigDecimal::add); BigDecimal periodServicePrice = collect.stream().map(TChargingOrderAccountingStrategy::getPeriodServicePrice).reduce(BigDecimal.ZERO, BigDecimal::add); totalElectrovalence = totalElectrovalence.add(periodElectricPrice); - commissionAmount = commissionAmount.add(order.getRechargeAmount().multiply(new BigDecimal("0.006"))); if(2 != order.getOrderSource()){ totalServiceCharge = totalServiceCharge.add(periodServicePrice); + commissionAmount = commissionAmount.add((periodElectricPrice.add(periodServicePrice)).multiply(new BigDecimal("0.006"))); }else{ totalServiceCharge = totalServiceCharge.add(periodServicePrice.multiply(new BigDecimal("0.8"))); sharingAmount = sharingAmount.add(periodServicePrice.multiply(new BigDecimal("0.2"))); @@ -1152,9 +1152,6 @@ data.addAll(data1); } ids = new HashSet<>(data); - }else{ - ids = new HashSet<>(); - ids.add(-1); } } mongoChargingOrderQuery.setSiteIds(ids); -- Gitblit v1.7.1