luodangjia
2024-12-16 a8d2cb07f6440dc54dc4005b0b06d5a47cb1517d
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java
@@ -60,7 +60,7 @@
         return R.fail("权限不足");
      }
      RefundPass one = refundPassService.getOne(new LambdaQueryWrapper<RefundPass>().eq(RefundPass::getOrderId, orderId)
            .eq(RefundPass::getDelFlag, 0).last(" order by createTime desc limit 0,1"));
            .eq(RefundPass::getDelFlag, 0).last(" order by create_time desc limit 0,1"));
      one.setIdStr(one.getId().toString());
      return R.ok(one);
   }
@@ -85,8 +85,8 @@
      if(Arrays.asList(2, 3).contains(refundPass.getStatus())){
         return R.fail("售后取消失败");
      }
      refundPass.setDelFlag(1);
      refundPassService.updateById(refundPass);
//      refundPass.setDelFlag(1);
      refundPassService.removeById(id);
      order.setOrderStatus(4);
      orderService.updateById(order);
      return R.ok();
@@ -114,6 +114,7 @@
         return R.fail("操作失败");
      }
      refundPass.setStatus(5);
      refundPass.setCode(code);
      refundPassService.updateById(refundPass);
      return R.ok();
   }