From 583d90f42d09979f4881abf0cb9c132c7ed203cc Mon Sep 17 00:00:00 2001 From: yang <2119157836@qq.com> Date: Fri, 7 Mar 2025 15:24:42 +0800 Subject: [PATCH] =?UTF-8?q?refactor(pay):=20=E6=8F=90=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../myInvitation/InvitationController.java | 7 +++---- .../pay/AliPay/AliPayController.java | 7 +++++-- .../src/main/resources/application-dev.yml | 8 ------- .../system/domain/dto/WithdrawalPageRes.java | 21 +++++++++++++++++++ .../service/ISysUserPayAccountLogService.java | 5 +++-- .../impl/SysUserPayAccountLogServiceImpl.java | 15 +++++++++---- 6 files changed, 43 insertions(+), 20 deletions(-) create mode 100644 mcwl-system/src/main/java/com/mcwl/system/domain/dto/WithdrawalPageRes.java diff --git a/mcwl-admin/src/main/java/com/mcwl/web/controller/myInvitation/InvitationController.java b/mcwl-admin/src/main/java/com/mcwl/web/controller/myInvitation/InvitationController.java index d887e6e..62d9b0a 100644 --- a/mcwl-admin/src/main/java/com/mcwl/web/controller/myInvitation/InvitationController.java +++ b/mcwl-admin/src/main/java/com/mcwl/web/controller/myInvitation/InvitationController.java @@ -1,15 +1,14 @@ package com.mcwl.web.controller.myInvitation; -import com.mcwl.common.core.domain.AjaxResult; import com.mcwl.common.core.domain.R; -import com.mcwl.common.core.page.PageDomain; import com.mcwl.common.core.page.TableDataInfo; import com.mcwl.common.utils.SecurityUtils; import com.mcwl.myInvitation.domain.Invitation; import com.mcwl.myInvitation.domain.dto.EarningsDisplayDto; import com.mcwl.myInvitation.service.InvitationService; import com.mcwl.myInvitation.domain.vo.EarningsDisplayVO; +import com.mcwl.system.domain.dto.WithdrawalPageRes; import com.mcwl.system.service.ISysUserPayAccountLogService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -121,9 +120,9 @@ public class InvitationController { */ @PostMapping("withdrawalRecord") @ApiOperation(value = "提现记录") - public TableDataInfo withdrawalRecord(@Valid @RequestBody PageDomain pageDomain) { + public TableDataInfo withdrawalRecord(@Valid @RequestBody WithdrawalPageRes withdrawalPageRes) { - return sysUserPayAccountLogService.getWithdrawalRecord(pageDomain); + return sysUserPayAccountLogService.getWithdrawalRecord(withdrawalPageRes); } diff --git a/mcwl-admin/src/main/java/com/mcwl/web/controller/pay/AliPay/AliPayController.java b/mcwl-admin/src/main/java/com/mcwl/web/controller/pay/AliPay/AliPayController.java index 73cbb1c..a42688c 100644 --- a/mcwl-admin/src/main/java/com/mcwl/web/controller/pay/AliPay/AliPayController.java +++ b/mcwl-admin/src/main/java/com/mcwl/web/controller/pay/AliPay/AliPayController.java @@ -29,7 +29,9 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; import java.io.FileNotFoundException; import java.net.URLEncoder; import java.util.HashMap; @@ -171,8 +173,9 @@ public class AliPayController extends BaseController { @ApiOperation(value = "提现") public R fetch(@Valid @NotNull(message = "提现金额不能为空") - Double amount) throws Exception { - if (amount < 0.1) { + @Pattern(regexp = "^(0|(?!0\\d)[1-9]\\d*)(\\.\\d{2})?$", message = "金额格式错误（必须保留两位小数）") + String amount) throws Exception { + if (Double.parseDouble(amount) < 0.1) { return R.fail("提现金额最小为0.1"); } diff --git a/mcwl-admin/src/main/resources/application-dev.yml b/mcwl-admin/src/main/resources/application-dev.yml index 822d33a..beea40a 100644 --- a/mcwl-admin/src/main/resources/application-dev.yml +++ b/mcwl-admin/src/main/resources/application-dev.yml @@ -99,14 +99,6 @@ spring: # #连接池最大阻塞等待时间（使用负值表示没有限制） max-wait: -1ms time-between-eviction-runs: 6000 - #ai配置 - ai: - dashscope: - base-url: https://api.deepseek.com/chat/completions - api-key: sk-5d1f611b6ba74b90ae9e3dff5aaa508a - chat: - options: - model: deepseek-chat # token配置 diff --git a/mcwl-system/src/main/java/com/mcwl/system/domain/dto/WithdrawalPageRes.java b/mcwl-system/src/main/java/com/mcwl/system/domain/dto/WithdrawalPageRes.java new file mode 100644 index 0000000..70bd562 --- /dev/null +++ b/mcwl-system/src/main/java/com/mcwl/system/domain/dto/WithdrawalPageRes.java @@ -0,0 +1,21 @@ +package com.mcwl.system.domain.dto; + +import com.mcwl.common.core.page.PageDomain; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 提现明细分页请求对象 + */ +@ApiModel(description = "提现明细分页请求对象") +@Data +@EqualsAndHashCode(callSuper = true) +public class WithdrawalPageRes extends PageDomain { + + @ApiModelProperty(value = "用户id") + private Long userId; + + +} diff --git a/mcwl-system/src/main/java/com/mcwl/system/service/ISysUserPayAccountLogService.java b/mcwl-system/src/main/java/com/mcwl/system/service/ISysUserPayAccountLogService.java index a223260..c1d173c 100644 --- a/mcwl-system/src/main/java/com/mcwl/system/service/ISysUserPayAccountLogService.java +++ b/mcwl-system/src/main/java/com/mcwl/system/service/ISysUserPayAccountLogService.java @@ -5,6 +5,7 @@ import com.mcwl.common.core.page.PageDomain; import com.mcwl.common.core.page.TableDataInfo; import com.mcwl.system.domain.SysUserPayAccount; import com.mcwl.system.domain.SysUserPayAccountLog; +import com.mcwl.system.domain.dto.WithdrawalPageRes; import javax.validation.Valid; @@ -18,8 +19,8 @@ public interface ISysUserPayAccountLogService extends IService page = new Page<>(pageDomain.getPageNum(), pageDomain.getPageSize()); + public TableDataInfo getWithdrawalRecord(WithdrawalPageRes withdrawalPageRes) { + + Long userId = withdrawalPageRes.getUserId(); + userId = Objects.isNull(userId) ? SecurityUtils.getUserId() : userId; + + Page page = new Page<>(withdrawalPageRes.getPageNum(), withdrawalPageRes.getPageSize()); baseMapper.selectPage(page, new LambdaQueryWrapper() .select(SysUserPayAccountLog::getAmount, SysUserPayAccountLog::getAccount, SysUserPayAccountLog::getCreateTime) - .eq(SysUserPayAccountLog::getUserId, SecurityUtils.getUserId())); + .eq(SysUserPayAccountLog::getUserId, userId)); TableDataInfo rspData = new TableDataInfo(); rspData.setCode(HttpStatus.SUCCESS);