From dc9239d73b15b9a51c46a9e8d25c0d4400e613ce Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 29 七月 2024 09:17:54 +0800
Subject: [PATCH] 7.29
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/WithdrawController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/WithdrawController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/WithdrawController.java
index 8221b9b..12e970a 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/WithdrawController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/WithdrawController.java
@@ -82,7 +82,7 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "提现记录id", name = "id", dataType = "Integer", required = true)
})
- public R<Withdraw> withdrawRecordDetail(@RequestParam("id") Integer id) {
+ public R<Withdraw> withdrawRecordDetail(@RequestParam("id") Long id) {
Withdraw withdraw = withdrawService.lambdaQuery().eq(Withdraw::getId, id)
.eq(Withdraw::getIsDelete, 0).one();
return R.ok(withdraw);
@@ -102,7 +102,7 @@
@ApiImplicitParam(value = "审批意见", name = "opinion", dataType = "String"),
@ApiImplicitParam(value = "审批同意/不同意(1同意;2驳回)", name = "state", dataType = "Integer", required = true)
})
- public R<Boolean> withdrawExamine(@RequestParam("id") Integer id, @RequestParam("state") Integer state,
+ public R<Boolean> withdrawExamine(@RequestParam("id") Long id, @RequestParam("state") Integer state,
@RequestParam(value = "opinion", required = false) String opinion,
@RequestParam(value = "openId") String openId,
@RequestParam(value = "userId") Integer userId) {
@@ -259,7 +259,7 @@
@RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
return R.ok(orderService.lambdaQuery().eq(Order::getUserId, userId)
- .eq(Order::getState, 3).eq(Order::getIsDelete, 0).page(Page.of(pageNum, pageSize)));
+ .eq(Order::getState, 3).page(Page.of(pageNum, pageSize)));
}
@GetMapping("/withdrawRecordList")
--
Gitblit v1.7.1