修改bug

puzhibing

2025-01-07 eb5d7885fa9e4bd20c0827eec9b4cdd48c47b509

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

@@ -76,7 +76,7 @@
      Order order = orderService.getById(applyRefundPass.getId());
      //判断是都已经超过售后时间
      LocalDateTime afterSaleTime = order.getAfterSaleTime();
      if(null != afterSaleTime && afterSaleTime.toEpochSecond(ZoneOffset.UTC) < LocalDateTime.now().toEpochSecond(ZoneOffset.UTC)){
      if(null != afterSaleTime && LocalDateTime.now().isAfter(afterSaleTime)){
         return R.fail("已超过售后期间");
      }
      
@@ -161,15 +161,18 @@
         refundPass.setStatus(2);
      }
      refundPass.setPassRemark(passRemark);
      this.updateById(refundPass);
      //仅退款的售后需要将支付金额原路返回，然后再扣减支付获得的积分
      if(refundPass.getRefundMethod() == 2 && 2 == status){
         Order order = orderService.getById(refundPass.getOrderId());
         order.setOrderStatus(6);
         orderService.updateById(order);
         //返回订单支付金额和回退积分和会员等级
         orderService.refundPayMoney(order);
         R r = orderService.refundPayMoney(order);
         if(200 != r.getCode()){
            return r;
         }
         orderService.updateById(order);
      }
      this.updateById(refundPass);
      return R.ok();
   }
   
@@ -189,13 +192,16 @@
         return R.fail("操作失败");
      }
      refundPass.setStatus(2);
      this.updateById(refundPass);
      //仅退款的售后需要将支付金额原路返回，然后再扣减支付获得的积分
      Order order = orderService.getById(refundPass.getOrderId());
      order.setOrderStatus(6);
      orderService.updateById(order);
      //返回订单支付金额和回退积分和会员等级
      orderService.refundPayMoney(order);
      R r = orderService.refundPayMoney(order);
      if(200 != r.getCode()){
         return r;
      }
      this.updateById(refundPass);
      orderService.updateById(order);
      return R.ok();
   }