From 77edfb324184d304ae7763aae3ab609f2b495da4 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 22 七月 2022 17:31:47 +0800
Subject: [PATCH] fix

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mChargingChargeService.java |   25 ++++++++++++++++++++-----
 1 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mChargingChargeService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mChargingChargeService.java
index 65d09f0..6710f35 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mChargingChargeService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mChargingChargeService.java
@@ -177,6 +177,20 @@
      * @return
      */
     public BigDecimal getCostByC3id(Long c3Id, Integer power) {
+        BigDecimal chargeDecimal = getchargeDecimalByC3id(c3Id);
+        BigDecimal powerDecimal = new BigDecimal(power);
+        BigDecimal result = chargeDecimal.multiply(powerDecimal);
+        return result;
+    }
+
+
+    /**
+     * 鏍规嵁c3Id鏌ユ壘璐圭巼
+     *
+     * @param c3Id
+     * @return
+     */
+    public BigDecimal getchargeDecimalByC3id(Long c3Id) {
         List<C3mChargingCharge> list = list(Wrappers.lambdaQuery(C3mChargingCharge.class).eq(C3mChargingCharge::getC3Id, c3Id));
         //鑾峰彇褰撳墠鏃堕棿
         LocalTime localTime = LocalTime.now();
@@ -209,10 +223,11 @@
             //鍏朵粬璐圭巼鏃讹紝鑾峰彇榛樿璐圭巼
             charge = 8.8;
         }
-        //璁$畻鑺辫垂  璐圭巼*鐢甸噺
-        BigDecimal chargeDecimal = new BigDecimal(charge);
-        BigDecimal powerDecimal = new BigDecimal(power);
-        BigDecimal result = chargeDecimal.multiply(powerDecimal);
-        return result;
+
+        //charge杞寲涓築igDecimal
+        //double鐩存帴浣跨敤 new BigDecimal()鏃朵細鍑虹幇绮惧害闂锛屾墍浠ラ渶瑕佷娇鐢˙igDecimal.valueOf()鏂规硶
+        BigDecimal chargeDecimal = BigDecimal.valueOf(charge);
+
+        return chargeDecimal;
     }
 }

--
Gitblit v1.9.3