From 1d64c14b6b0e9bbcae2736f83c0a498b5083d1d6 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 16 十二月 2024 17:11:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java
index 94c893a..893ae60 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java
@@ -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();
}
--
Gitblit v1.7.1