Bladeren bron

fix 可能出现的启动充电异常

skyline 2 jaren geleden
bovenliggende
commit
18e807d9b1
1 gewijzigde bestanden met toevoegingen van 5 en 2 verwijderingen
  1. 5 2
      service/src/main/java/com/kym/service/miniapp/impl/ChargeOrderServiceImpl.java

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

@@ -40,7 +40,10 @@ public class ChargeOrderServiceImpl extends ServiceImpl<ChargeOrderMapper, Charg
 
     @Override
     public ChargeOrder getChargingOrderByUserId(Long userId) {
-        return lambdaQuery().eq(ChargeOrder::getUserId, userId).eq(ChargeOrder::getChargeStatus, 2).one();
+        return lambdaQuery()
+                .eq(ChargeOrder::getUserId, userId)
+                .in(ChargeOrder::getChargeStatus, ChargeOrder.CHARGE_STATUS_启动中, ChargeOrder.CHARGE_STATUS_充电中)
+                .one();
     }
 
     @Override
@@ -82,7 +85,7 @@ public class ChargeOrderServiceImpl extends ServiceImpl<ChargeOrderMapper, Charg
     public PageBean<StationStatVo> stationStat(StatQueryParam params) {
         PageHelper.startPage(params.getPageNum(), params.getPageSize());
         var res = baseMapper.stationStat(params).stream().peek(item -> {
-            item.setElecMoneyPercent((new BigDecimal(item.getElecMoney())).divide(new BigDecimal(Math.max(1,item.getTotalMoney())), 2, RoundingMode.HALF_UP));
+            item.setElecMoneyPercent((new BigDecimal(item.getElecMoney())).divide(new BigDecimal(Math.max(1, item.getTotalMoney())), 2, RoundingMode.HALF_UP));
             item.setServiceMoneyPercent(BigDecimal.ONE.subtract(item.getElecMoneyPercent()));
         }).collect(Collectors.toList());
         return new PageBean<>(res);