From 741b598525b8d9be7869a62192919c95d51f3504 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 14 一月 2025 13:32:59 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 e139ff9..a53dea7 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
@@ -67,6 +67,7 @@
RefundPass one = refundPassService.getOne(new LambdaQueryWrapper<RefundPass>().eq(RefundPass::getOrderId, orderId)
.eq(RefundPass::getDelFlag, 0).last(" order by create_time desc limit 0,1"));
one.setIdStr(one.getId().toString());
+ one.setAddressJson(order.getAddressJson());
return R.ok(one);
}
@@ -90,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();
}
--
Gitblit v1.7.1