Merge branch 'refs/heads/2.0' into 2.0.1

“mitao”

2026-05-14 1bcc12e18a21e4fd5a297d710fe94617f74d398a

Merge branch 'refs/heads/2.0' into 2.0.1

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

@@ -379,7 +379,7 @@
            }
            myChargingOrderInfo.setPower(power);
        }
        myChargingOrderInfo.setActionable(myChargingOrderInfo.getEndTime() + 604800000L < System.currentTimeMillis() ? 0 : 1);
        myChargingOrderInfo.setActionable(myChargingOrderInfo.getEndTime()==null || myChargingOrderInfo.getEndTime() + 604800000L < System.currentTimeMillis() ? 0 : 1);
        long count = orderAppealService.count(Wrappers.lambdaQuery(TOrderAppeal.class)
                .eq(TOrderAppeal::getOrderId, id));
        myChargingOrderInfo.setIsAppeal(count > 0 ? 0 : 1);