Merge branch 'master' into dev

service/src/main/java/com/kym/service/miniapp/impl/ChargeOrderServiceImpl.java

@@ -40,10 +40,9 @@ public class ChargeOrderServiceImpl extends ServiceImpl<ChargeOrderMapper, Charg
 
     @Override
     public ChargeOrder getChargingOrderByUserId(Long userId) {
-        return lambdaQuery().eq(ChargeOrder::getUserId, userId)
-                .eq(ChargeOrder::getChargeStatus, ChargeOrder.CHARGE_STATUS_启动中)
-                .or()
-                .eq(ChargeOrder::getChargeStatus,ChargeOrder.CHARGE_STATUS_充电中)
+        return lambdaQuery()
+                .eq(ChargeOrder::getUserId, userId)
+                .in(ChargeOrder::getChargeStatus, ChargeOrder.CHARGE_STATUS_启动中, ChargeOrder.CHARGE_STATUS_充电中)
                 .one();
     }
 
@@ -86,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);