Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-09-30 f541eaa5c92cb112af6d3f656275105606d31b39

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

@@ -948,6 +948,9 @@
               throw new RuntimeException(failure_cause);
            }

            // 将枪状态重置为空闲
            chargingGun.setStatus(2);
            chargingGunClient.updateChargingGunById(chargingGun);
            //计算费用，处理退款
            endCharge(chargingOrder);
            break;