소스 검색

计费改版

李进 1 년 전
부모
커밋
36ad4963ca
1개의 변경된 파일1개의 추가작업 그리고 4개의 파일을 삭제
  1. 1 4
      device-api-service/src/main/java/com/xy/service/DeviceAlgorithmChargingServiceImpl.java

+ 1 - 4
device-api-service/src/main/java/com/xy/service/DeviceAlgorithmChargingServiceImpl.java

@@ -180,13 +180,10 @@ public class DeviceAlgorithmChargingServiceImpl extends ServiceImpl<DeviceAlgori
         });
         //处理无期限
         infs.forEach(deviceAlgorithmChargingHistory -> {
-            SysDictRedis algorithmMoonConfigDict = algorithmMoonConfigMaps.get(deviceAlgorithmChargingHistory.getAlgorithmId().toString());
-            DeviceAlgorithmChargingDto.AlgorithmMoonConfig algorithmMoonConfig = JSONUtil.parseObj(algorithmMoonConfigDict.getValue()).toBean(DeviceAlgorithmChargingDto.AlgorithmMoonConfig.class);
-            DeviceAlgorithmChargingDto.AlgorithmMoonConfig.Inf inf = algorithmMoonConfig.getInf();
             DeviceAlgorithmCharging deviceAlgorithmChargingInfo = new DeviceAlgorithmCharging()
                     .setDeviceId(deviceAlgorithmChargingHistory.getDeviceId())
                     .setAlgorithmId(deviceAlgorithmChargingHistory.getAlgorithmId())
-                    .setUnusedSize(inf.getSize() * deviceAlgorithmChargingHistory.getChargingSize())
+                    .setUnusedSize(deviceAlgorithmChargingHistory.getChargingSize())
                     .setType(deviceAlgorithmChargingHistory.getType())
                     .setName(deviceAlgorithmChargingHistory.getName())
                     .setTimeout(-1)