合并代码

Pu Zhibing

2024-11-06 9fde1b2e2218955c6aa73dff85d7dd175f0d467a

合并代码

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/CouponService.java

@@ -70,7 +70,7 @@
        GetCouponResp resp = new GetCouponResp();
        resp.setRecordId(data.getId());
        resp.setCarNumber(carNumber);
        resp.setSysOrgId("MXCD7QjHapTJGZ8TZZz3");
        resp.setSysOrgId("MXCD0001");
        resp.setPosName("明星电力");
        resp.setLssuer("admin");
        resp.setType(4);

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java

@@ -963,9 +963,8 @@
        if(null != chargingHandshake && null != data && null != one.getAppUserCarId()){
            BigDecimal bms_battery_capacity = chargingHandshake.getBms_battery_capacity();
            TAppUserCar appUserCar = appUserCarClient.getCarByIds(Arrays.asList(one.getAppUserCarId())).getData().get(0);
            //   续航 = 电池容量 / 续航里程 * soc
            BigDecimal divide = bms_battery_capacity.divide(new BigDecimal(appUserCar.getEndurance()));
            BigDecimal multiply = new BigDecimal(data.getSoc() / 100).multiply(divide);
            //   续航 = 续航里程 * soc
            BigDecimal multiply = new BigDecimal(data.getSoc() / 100).multiply(new BigDecimal(appUserCar.getEndurance()));
            chargingDetails.setEndurance(multiply);
        }
        return chargingDetails;