zhibing.pu
2024-09-05 91317e7295857bdaac361d7ab59f595860eb8d7b
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -877,7 +877,7 @@
         chargingOrder.setOrderAmount(total);
      }
      
      if(chargingOrder.getEndMode() != 1){
      if(chargingOrder.getEndMode() == 2){
         chargingOrder.setEndMode(refundAmount.compareTo(BigDecimal.ZERO) > 0 ? 2 : 3);
      }
      chargingOrder.setStatus(5);
@@ -1488,14 +1488,14 @@
    */
   @Override
   @GlobalTransactional(rollbackFor = Exception.class)
   public void endCharge(String orderCode) {
   public void endCharge(String orderCode, Integer endMode) {
      TChargingOrder chargingOrder = this.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getCode, orderCode));
      Integer status = chargingOrder.getStatus();
      if(status == 4 || status == 5){
         return;
      }
      chargingOrder.setStatus(5);
      chargingOrder.setEndMode(2);
      chargingOrder.setEndMode(endMode);
      this.updateById(chargingOrder);
      
      //计算费用,处理退款
@@ -1540,4 +1540,13 @@
         appUserClient.updateAppUser(appUser1);
      }
   }
   /**
    * 异常结束充电处理逻辑
    * @param orderCode
    */
   @Override
   public void excelEndCharge(String orderCode) {
      endCharge(orderCode, 0);
   }
}