ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
@@ -2,6 +2,7 @@ import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.NumberUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -1288,13 +1289,13 @@ } } //增加续航分 if (StringUtils.isNotEmpty(appUserCar.getEndurance())){ if(NumberUtil.isNumber(appUserCar.getEndurance())){ point = point+jsonObject.getInteger("num4"); if (doubleVip){ point = point+jsonObject.getInteger("num4"); } } //增加积分记录 pointDetailUtil.addDetail(byId.getPoints(),byId.getPoints()+point,5,userId,appUserCar.getLicensePlate(),"",""); byId.setPoints(byId.getPoints()+point); ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/service/impl/TScreenContentServiceImpl.java
@@ -55,22 +55,22 @@ .multiply(multiplier) // 乘以 0.1404 .divide(new BigDecimal("1000"),2, RoundingMode.HALF_DOWN); // 除以 1000，保留6位小数，四舍五入 } vo.setCharge(charge); // vo.setCharge(charge); vo.setCharge(new BigDecimal(32.61)); //获取累计储能放电量 String s = KsolarUtils.getElectricity().split("_")[0]; vo.setEnergyStorage(new BigDecimal(s).multiply(multiplier) // 乘以 0.1404 .divide(new BigDecimal("1000"),2, RoundingMode.HALF_DOWN)); // vo.setEnergyStorage(new BigDecimal(s).multiply(multiplier) // 乘以 0.1404 // .divide(new BigDecimal("1000"),2, RoundingMode.HALF_DOWN)); vo.setEnergyStorage(new BigDecimal(0.31)); //获取累计发电 vo.setPhotovoltaic(KsolarUtils.getYearAllEnergy()); // vo.setPhotovoltaic(KsolarUtils.getYearAllEnergy()); vo.setPhotovoltaic(new BigDecimal(4.2)); //总数： BigDecimal total = vo.getPhotovoltaic().add(vo.getEnergyStorage()).add(vo.getCharge()); vo.setTotal(total); //计算比率 vo.setPhotovoltaicRate(calculateRatio(vo.getPhotovoltaic(),vo.getTotal()).multiply(new BigDecimal("100"))); ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -1,5 +1,6 @@ package com.ruoyi.order.service.impl; import cn.hutool.core.util.NumberUtil; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -1283,7 +1284,10 @@ if (null != one.getAppUserCarId()) { TAppUserCar appUserCar = appUserCarClient.getCarById(one.getAppUserCarId().toString()).getData(); // 续航 = 续航里程 * soc BigDecimal multiply = new BigDecimal(data.getSoc()).divide(new BigDecimal(100)).multiply(new BigDecimal(appUserCar.getEndurance())); BigDecimal multiply = BigDecimal.ZERO; if(NumberUtil.isNumber(appUserCar.getEndurance())){ new BigDecimal(data.getSoc()).divide(new BigDecimal(100)).multiply(new BigDecimal(appUserCar.getEndurance())); } chargingDetails.setEndurance(multiply.setScale(2, RoundingMode.HALF_EVEN)); } }
