From 6a9a7a8ec19e967ca521af5e6f0d8f4f59cc48a2 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 10 十二月 2024 10:05:08 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java | 3 ++-
1 files changed, 2 insertions(+), 1 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 8b6f689..84d5395 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
@@ -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);
}
@@ -114,6 +114,7 @@
return R.fail("操作失败");
}
refundPass.setStatus(5);
+ refundPass.setCode(code);
refundPassService.updateById(refundPass);
return R.ok();
}
--
Gitblit v1.7.1