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

无关风月

2025-01-14 6ccd0f9e28c083e5f62d7d5074a85584a77af6bb

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java

@@ -91,9 +91,9 @@
      if(Arrays.asList(2, 3).contains(refundPass.getStatus())){
         return R.fail("售后取消失败");
      }
//      refundPass.setDelFlag(1);
      refundPassService.removeById(id);
      order.setOrderStatus(4);
      refundPass.setDelFlag(1);
      refundPassService.updateById(refundPass);
      order.setOrderStatus(order.getOldOrderStatus());
      orderService.updateById(order);
      return R.ok();
   }