From f6b8f3b4e6419e5675bf400e005b8ba115fb1dc1 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 25 Sep 2021 17:20:13 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 22 ++++++++++++++++++++++
1 files changed, 22 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 7e0522b..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,6 +358,10 @@
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("支付密码错误");
}
@@ -353,6 +370,11 @@
throw new FebsException("最小提现金额为100");
}
+ MallMemberPayment payment = mallMemberPaymentMapper.selectByMemberId(memberId);
+ if (payment == null) {
+ throw new FebsException("未设置收款方式");
+ }
+
walletService.reduceBalance(withdrawalDto.getAmount(), memberId);
String orderNo = MallUtils.getOrderNum("W");
this.addMoneyFlow(memberId, withdrawalDto.getAmount().negate(), MoneyFlowTypeEnum.WITHDRAWAL.getValue(), orderNo, null, null, null, 1);
--
Gitblit v1.9.1