From 83dbfeab6fe421bf11b39429dca32469b8a1b9f8 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 25 Sep 2021 18:44:44 +0800
Subject: [PATCH] 20210925
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index 8f690f8..10d2594 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -211,6 +211,15 @@
mallMemberVo.setReferrerName(referMember.getName());
}
+ if (StrUtil.isNotBlank(mallMember.getTradePassword())) {
+ mallMemberVo.setHasTradePwd(1);
+ }
+
+ MallMemberPayment payment = mallMemberPaymentMapper.selectByMemberId(id);
+ if (payment != null) {
+ mallMemberVo.setHasPayment(1);
+ }
+
MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(mallMemberVo.getId());
mallMemberVo.setBalance(wallet.getBalance());
return new FebsResponse().success().data(mallMemberVo);
@@ -329,6 +338,10 @@
Long memberId = LoginUserUtil.getLoginUser().getId();
MallMember loginMember = this.baseMapper.selectById(memberId);
+ if (StrUtil.isBlank(loginMember.getTradePassword())) {
+ throw new FebsException("未设置支付密码");
+ }
+
if (!loginMember.getTradePassword().equals(SecureUtil.md5(transferDto.getTradePwd()))) {
throw new FebsException("支付密码错误");
}
@@ -345,12 +358,21 @@
public void withdrawal(WithdrawalDto withdrawalDto) {
Long memberId = LoginUserUtil.getLoginUser().getId();
MallMember mallMember = this.baseMapper.selectById(memberId);
+ if (StrUtil.isBlank(mallMember.getTradePassword())) {
+ throw new FebsException("未设置支付密码");
+ }
+
if (!mallMember.getTradePassword().equals(SecureUtil.md5(withdrawalDto.getTradePwd()))) {
throw new FebsException("支付密码错误");
}
if (withdrawalDto.getAmount().compareTo(BigDecimal.valueOf(100)) < 0) {
throw new FebsException("最小提现金额为100");
+ }
+
+ MallMemberPayment payment = mallMemberPaymentMapper.selectByMemberId(memberId);
+ if (payment == null) {
+ throw new FebsException("未设置收款方式");
}
walletService.reduceBalance(withdrawalDto.getAmount(), memberId);
@@ -371,4 +393,10 @@
mallMemberPaymentMapper.updateById(mallMemberPayment);
}
}
+
+ @Override
+ public MallMemberPayment findMemberPayment() {
+ MallMember member = LoginUserUtil.getLoginUser();
+ return mallMemberPaymentMapper.selectByMemberId(member.getId());
+ }
}
--
Gitblit v1.9.1