From 99203fa593de680d4af6ef3778cd0466f48ab694 Mon Sep 17 00:00:00 2001 From: Derran Date: Fri, 10 May 2024 18:58:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../withdrawaudit/entity/WithdrawAudit.java | 20 ++++++++++++++ .../WithdrawAuditUserCommandController.java | 27 +++++++++++++++++++ .../UserApplyWalletAccountWithdrawDto.java | 18 +++++++++++++ .../user/response/UserGetWalletAccountVo.java | 2 +- .../WalletAccountApplicationService.java | 7 +++++ .../impl/WalletAccountQueryServiceImpl.java | 2 +- 6 files changed, 74 insertions(+), 2 deletions(-) create mode 100644 dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/withdrawaudit/entity/WithdrawAudit.java create mode 100644 dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/withdrawaudit/user/WithdrawAuditUserCommandController.java create mode 100644 dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/withdrawaudit/user/request/UserApplyWalletAccountWithdrawDto.java create mode 100644 dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/walletaccount/WalletAccountApplicationService.java diff --git a/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/withdrawaudit/entity/WithdrawAudit.java b/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/withdrawaudit/entity/WithdrawAudit.java new file mode 100644 index 0000000..10de4de --- /dev/null +++ b/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/withdrawaudit/entity/WithdrawAudit.java @@ -0,0 +1,20 @@ +package com.qniao.dam.domain.aggregate.withdrawaudit.entity; + + +import com.baomidou.mybatisplus.annotation.TableName; +import com.qniao.domain.Entity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("da_withdraw_audit") +public class WithdrawAudit extends Entity { + + @ApiModelProperty("用户唯一标识") + private Long userId; + + + +} diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/withdrawaudit/user/WithdrawAuditUserCommandController.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/withdrawaudit/user/WithdrawAuditUserCommandController.java new file mode 100644 index 0000000..262ce1c --- /dev/null +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/withdrawaudit/user/WithdrawAuditUserCommandController.java @@ -0,0 +1,27 @@ +package com.qniao.dam.api.command.withdrawaudit.user; + +import com.qniao.dam.api.command.withdrawaudit.user.request.UserApplyWalletAccountWithdrawDto; +import com.qniao.dam.application.service.walletaccount.WalletAccountApplicationService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.validation.Valid; + +@RestController +@RequestMapping("user") +@Api(tags = "提现审核") +public class WithdrawAuditUserCommandController { + + @Resource + private WalletAccountApplicationService walletAccountApplicationService; + + @ApiOperation("用户发起提现申请") + @PostMapping("apply/wallet-account/withdraw") + public void userApplyWalletAccountWithdraw(@RequestBody @Valid UserApplyWalletAccountWithdrawDto dto, + @RequestParam("userId") Long userId) { + //return walletAccountApplicationService.applyWithdraw(dto); + } + +} diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/withdrawaudit/user/request/UserApplyWalletAccountWithdrawDto.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/withdrawaudit/user/request/UserApplyWalletAccountWithdrawDto.java new file mode 100644 index 0000000..c9b911d --- /dev/null +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/withdrawaudit/user/request/UserApplyWalletAccountWithdrawDto.java @@ -0,0 +1,18 @@ +package com.qniao.dam.api.command.withdrawaudit.user.request; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.DecimalMin; +import javax.validation.constraints.NotNull; +import java.math.BigDecimal; + +@Data +public class UserApplyWalletAccountWithdrawDto { + + @ApiModelProperty("提现金额") + @NotNull(message = "提现金额不能为空") + @DecimalMin(value = "0.01", message = "提现金额不等低于0.01") + private BigDecimal withdrawAmount; + +} diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/walletaccount/user/response/UserGetWalletAccountVo.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/walletaccount/user/response/UserGetWalletAccountVo.java index 3865e94..1c1378f 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/walletaccount/user/response/UserGetWalletAccountVo.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/walletaccount/user/response/UserGetWalletAccountVo.java @@ -24,6 +24,6 @@ public class UserGetWalletAccountVo { private BigDecimal frozenBalance = BigDecimal.ZERO; @ApiModelProperty("总提现金额") - private BigDecimal totalWithdraw = BigDecimal.ZERO; + private BigDecimal totalWithdrawBalance = BigDecimal.ZERO; } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/walletaccount/WalletAccountApplicationService.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/walletaccount/WalletAccountApplicationService.java new file mode 100644 index 0000000..774bd57 --- /dev/null +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/walletaccount/WalletAccountApplicationService.java @@ -0,0 +1,7 @@ +package com.qniao.dam.application.service.walletaccount; + +import org.springframework.stereotype.Service; + +@Service +public class WalletAccountApplicationService { +} diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/walletaccount/impl/WalletAccountQueryServiceImpl.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/walletaccount/impl/WalletAccountQueryServiceImpl.java index c115eca..ad2ffeb 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/walletaccount/impl/WalletAccountQueryServiceImpl.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/walletaccount/impl/WalletAccountQueryServiceImpl.java @@ -48,7 +48,7 @@ public class WalletAccountQueryServiceImpl implements WalletAccountQueryService WalletAccount walletAccount = queryByUserId(userId); if (Objects.nonNull(walletAccount)) { walletAccountVo = TypeConvertUtils.convert(walletAccount, UserGetWalletAccountVo.class); - walletAccountVo.setTotalWithdraw(walletAccountRecordDao.selectList(new LambdaQueryWrapper() + walletAccountVo.setTotalWithdrawBalance(walletAccountRecordDao.selectList(new LambdaQueryWrapper() .eq(WalletAccountRecord::getWalletAccountId, walletAccount.getId()) .eq(WalletAccountRecord::getTradeType, TradeTypeEnum.WITHDRAW)) .stream().map(WalletAccountRecord::getTradeAmount).reduce(BigDecimal.ZERO, BigDecimal::add));