skyline 2 rokov pred
rodič
commit
f34438a3b0

+ 1 - 1
service/src/main/java/com/kym/service/miniapp/impl/ChargeOrderServiceImpl.java

@@ -173,7 +173,7 @@ public class ChargeOrderServiceImpl extends ServiceImpl<ChargeOrderMapper, Charg
             item.setServiceMoneyPercent(BigDecimal.ONE.subtract(item.getElecMoneyPercent()));
         }).collect(Collectors.toList());
         var map = Map.of(
-                "totalPower", res.stream().mapToDouble(StationStatVo::getTotalPower).sum(),
+                "totalPower", BigDecimal.valueOf(res.stream().mapToDouble(StationStatVo::getTotalPower).sum()).setScale(2,RoundingMode.HALF_UP).doubleValue(),
                 "serviceMoney", res.stream().mapToInt(StationStatVo::getServiceMoney).sum()
         );
         return new PageBean<>(res).setExtraData(map);

+ 1 - 1
service/src/main/java/com/kym/service/utils/KymCache.java

@@ -110,7 +110,7 @@ public class KymCache {
         var res = ADMIN_USER_STATION.get(adminUserId);
         if (res == null) {
             var adminUserStation = adminUserStationService.lambdaQuery().eq(AdminUserStation::getAdminUserId, adminUserId).one();
-            res = adminUserStation.getStationId();
+            res = adminUserStation == null ? null : adminUserStation.getStationId();
         }
         return res;
     }