Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charg...

无关风月

2025-02-07 868c3abecb61cf4475a93ce6fd10ca0eb3ce96b9

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

@@ -396,7 +396,7 @@
            if(null != data){
               //支付失败，删除无效的订单
               String tradeStatus = data.getTradeStatus();
               if(tradeStatus.equals("TRADE_CLOSED")){
               if(null != tradeStatus && tradeStatus.equals("TRADE_CLOSED")){
                  this.removeById(tChargingOrder.getId());
               }
            }
@@ -2194,7 +2194,7 @@
         Integer soc = uploadRealTimeMonitoringData.getSoc();
         if(soc > 98){
            order.setEndMode(2);
         }else if(order.getResidualAmount().compareTo(new BigDecimal(1)) <= 0){
         }else if(chargingOrder.getResidualAmount().compareTo(new BigDecimal(1)) <= 0){
            order.setEndMode(3);
         }else{
            order.setEndMode(0);