From 34c7d903efa4dc06a0f7b38bc5d2d721f80b220d Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 09 七月 2025 09:04:52 +0800
Subject: [PATCH] 7.8冒烟修改问题
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/UserAccountController.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/UserAccountController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/UserAccountController.java
index 80e2b19..356a94d 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/UserAccountController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/UserAccountController.java
@@ -12,6 +12,7 @@
import com.ruoyi.system.model.*;
import com.ruoyi.system.query.UserAccountDetailQuery;
import com.ruoyi.system.service.*;
+import com.ruoyi.system.vo.GetWithdrawalDetailVo;
import com.ruoyi.system.vo.RegionVo;
import com.ruoyi.system.vo.UserAccountVo;
import io.swagger.annotations.Api;
@@ -79,8 +80,8 @@
public R<Page<TbAccountDetail>> getUserAccountDetail(UserAccountDetailQuery query) {
LoginUser loginUser = tokenService.getLoginUser();
LambdaQueryWrapper<TbAccountDetail> wrapper = new LambdaQueryWrapper<>();
- if(StringUtils.isNotEmpty(query.getStartTime()) && StringUtils.isNotEmpty(query.getEndTime())){
- wrapper.between(TbAccountDetail::getCreateTime,query.getStartTime(),query.getEndTime());
+ if(StringUtils.isNotEmpty(query.getTime())){
+ wrapper.likeRight(TbAccountDetail::getCreateTime,query.getTime());
}
wrapper.eq(TbAccountDetail::getUserId,loginUser.getUserId());
wrapper.orderByDesc(TbAccountDetail::getCreateTime);
@@ -94,7 +95,7 @@
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public R<?> withdrawal(@RequestBody @Valid UserWithdrawalDto dto) {
if(dto.getAmount()<=0){
- return R.fail("提现金额不能小于0");
+ return R.fail("提现金额不能小于等于0");
}
LoginUser loginUser = tokenService.getLoginUser();
TbUser user = userService.getById(loginUser.getUserId());
@@ -161,6 +162,18 @@
}
+ @ApiOperation(value = "提现说明需求",tags = {"用户钱包模块"})
+ @GetMapping("/getWithdrawalDetail")
+ public R<GetWithdrawalDetailVo> getWithdrawalDetail(@RequestParam String sourceId) {
+ TbWithdrawal withdrawal = withdrawalService.getById(sourceId);
+ GetWithdrawalDetailVo vo = new GetWithdrawalDetailVo();
+ vo.setImg(withdrawal.getImg());
+ vo.setRemark(withdrawal.getRemark());
+ return R.ok(vo);
+ }
+
+
+
--
Gitblit v1.7.1