From deaf2b0b4ada3689e235754b61c9c34133c00157 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 27 Apr 2022 16:48:37 +0800
Subject: [PATCH] add member center some interface
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 197 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 183 insertions(+), 14 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 979c1f7..2631bd7 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
@@ -1,22 +1,20 @@
package cc.mrbird.febs.mall.service.impl;
import cc.mrbird.febs.common.entity.FebsResponse;
+import cc.mrbird.febs.common.enumerates.AgentLevelEnum;
+import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
import cc.mrbird.febs.common.exception.FebsException;
-import cc.mrbird.febs.common.utils.AppContants;
-import cc.mrbird.febs.common.utils.LoginUserUtil;
-import cc.mrbird.febs.common.utils.RedisUtils;
-import cc.mrbird.febs.common.utils.ShareCodeUtil;
+import cc.mrbird.febs.common.utils.*;
import cc.mrbird.febs.mall.conversion.MallMemberConversion;
import cc.mrbird.febs.mall.dto.*;
-import cc.mrbird.febs.mall.entity.MallMember;
-import cc.mrbird.febs.mall.entity.MallMemberWallet;
-import cc.mrbird.febs.mall.entity.MallMoneyFlow;
-import cc.mrbird.febs.mall.entity.MallShoppingCart;
+import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.IApiMallMemberService;
+import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
import cc.mrbird.febs.mall.service.ICommonService;
import cc.mrbird.febs.mall.vo.MallMemberVo;
import cc.mrbird.febs.mall.vo.MoneyFlowVo;
+import cc.mrbird.febs.mall.vo.RankListVo;
import cc.mrbird.febs.mall.vo.TeamListVo;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil;
@@ -36,6 +34,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -55,6 +54,9 @@
private final MallOrderInfoMapper mallOrderInfoMapper;
private final MallShoppingCartMapper mallShoppingCartMapper;
private final MallMoneyFlowMapper mallMoneyFlowMapper;
+ private final IApiMallMemberWalletService walletService;
+ private final MallMemberPaymentMapper mallMemberPaymentMapper;
+ private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
@Value("${spring.profiles.active}")
private String active;
@@ -64,7 +66,7 @@
public FebsResponse register(RegisterDto registerDto) {
MallMember mallMember = this.baseMapper.selectInfoByAccount(registerDto.getAccount());
if (mallMember != null) {
- throw new FebsException("该手机号/邮箱已被占用");
+ throw new FebsException("该账号已被占用");
}
String account = registerDto.getAccount();
@@ -97,7 +99,7 @@
mallMember.setName(registerDto.getAccount());
mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_ENABLE);
mallMember.setAccountType(MallMember.ACCOUNT_TYPE_NORMAL);
- mallMember.setLevel("1");
+ mallMember.setLevel(AgentLevelEnum.ZERO_LEVEL.name());
mallMember.setSex("男");
this.baseMapper.insert(mallMember);
@@ -108,6 +110,9 @@
//推荐人和推荐人链
boolean flag = false;
String parentId = mallMember.getReferrerId();
+ if (StrUtil.isBlank(parentId)) {
+ flag = true;
+ }
String ids = "";
while (!flag) {
if (StrUtil.isBlank(ids)) {
@@ -164,9 +169,7 @@
redisUtils.set(redisKey, token, 360000);
Map<String, Object> authInfo = new HashMap<>();
authInfo.put("token", token);
- if ("dev".equals(active)) {
- authInfo.put("rasToken", generateAsaToken(token));
- }
+ authInfo.put("rasToken", generateAsaToken(token));
return new FebsResponse().success().data(authInfo);
}
@@ -213,8 +216,24 @@
mallMemberVo.setReferrerName(referMember.getName());
}
+ if (StrUtil.isNotBlank(mallMember.getTradePassword())) {
+ mallMemberVo.setHasTradePwd(1);
+ }
+
+ MallMemberPayment payment = mallMemberPaymentMapper.selectByMemberId(id);
+ if (payment != null) {
+ mallMemberVo.setHasPayment(1);
+ }
+
+ DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.AGENT_LEVEL, mallMember.getLevel());
+ if (dic != null) {
+ mallMemberVo.setLevelName(dic.getDescription());
+ }
MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(mallMemberVo.getId());
mallMemberVo.setBalance(wallet.getBalance());
+ mallMemberVo.setScore(wallet.getScore());
+ mallMemberVo.setPrizeScore(wallet.getPrizeScore());
+ mallMemberVo.setTotalCost(mallOrderInfoMapper.selectTotalAmount(id));
return new FebsResponse().success().data(mallMemberVo);
}
@@ -239,7 +258,8 @@
@Override
public FebsResponse setTradePwd(ForgetPwdDto forgetPwdDto) {
- MallMember mallMember = this.baseMapper.selectInfoByAccount(forgetPwdDto.getAccount());
+ MallMember memberId = LoginUserUtil.getLoginUser();
+ MallMember mallMember = this.baseMapper.selectById(memberId);
if (mallMember == null) {
throw new FebsException("账号不存在");
}
@@ -320,4 +340,153 @@
flow.setStatus(status);
mallMoneyFlowMapper.insert(flow);
}
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void transfer(TransferDto transferDto) {
+ MallMember mallMember = this.baseMapper.selectInfoByAccount(transferDto.getAccount());
+ if (mallMember == null) {
+ throw new FebsException("用户不存在");
+ }
+
+ Long memberId = LoginUserUtil.getLoginUser().getId();
+ MallMember loginMember = this.baseMapper.selectById(memberId);
+
+ if (loginMember.getPhone().equals(transferDto.getAccount()) || loginMember.getInviteId().equals(transferDto.getAccount())) {
+ throw new FebsException("不能给自己转账");
+ }
+
+ if (StrUtil.isBlank(loginMember.getTradePassword())) {
+ throw new FebsException("未设置支付密码");
+ }
+
+ if (!loginMember.getTradePassword().equals(SecureUtil.md5(transferDto.getTradePwd()))) {
+ throw new FebsException("支付密码错误");
+ }
+
+ walletService.reduceBalance(transferDto.getAmount(), memberId);
+ String orderNo = MallUtils.getOrderNum("T");
+ this.addMoneyFlow(memberId, transferDto.getAmount().negate(), MoneyFlowTypeEnum.TRANSFER.getValue(), orderNo, null, null, mallMember.getId(), null);
+
+ walletService.addBalance(transferDto.getAmount(), mallMember.getId());
+ this.addMoneyFlow(mallMember.getId(), transferDto.getAmount(), MoneyFlowTypeEnum.TRANSFER.getValue(), orderNo, null, null, memberId, null);
+ }
+
+ @Override
+ 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("未设置收款方式");
+// }
+
+ BigDecimal profit = mallMoneyFlowMapper.selectProfitByDateAndMemberId(memberId);
+ MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(memberId);
+ if (profit != null) {
+ // 可提现
+ BigDecimal canMoney = wallet.getBalance().subtract(profit);
+
+ if(withdrawalDto.getAmount().compareTo(canMoney) > 0) {
+ 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);
+ }
+
+ @Override
+ public void setPayment(MallMemberPayment mallMemberPayment) {
+ MallMember member = LoginUserUtil.getLoginUser();
+
+ MallMemberPayment exist = mallMemberPaymentMapper.selectByMemberId(member.getId());
+ if (exist == null) {
+ mallMemberPayment.setMemberId(member.getId());
+ mallMemberPaymentMapper.insert(mallMemberPayment);
+ } else {
+ mallMemberPayment.setId(exist.getId());
+ mallMemberPaymentMapper.updateById(mallMemberPayment);
+ }
+ }
+
+ @Override
+ public MallMemberPayment findMemberPayment() {
+ MallMember member = LoginUserUtil.getLoginUser();
+ return mallMemberPaymentMapper.selectByMemberId(member.getId());
+ }
+
+ @Override
+ public void bindPhone(AccountAndCodeDto accountAndCodeDto) {
+ boolean b = commonService.verifyCode(accountAndCodeDto.getAccount(), accountAndCodeDto.getCode());
+ if (!b) {
+ throw new FebsException("验证码错误");
+ }
+
+ Long id = LoginUserUtil.getLoginUser().getId();
+ MallMember member = this.baseMapper.selectById(id);
+
+ member.setBindPhone(accountAndCodeDto.getAccount());
+ this.baseMapper.updateById(member);
+ }
+
+ @Override
+ public BigDecimal canMoney() {
+ Long memberId = LoginUserUtil.getLoginUser().getId();
+ MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(memberId);
+ BigDecimal profit = mallMoneyFlowMapper.selectProfitByDateAndMemberId(memberId);
+
+ BigDecimal canMoney = wallet.getBalance();
+ if (profit != null) {
+ if(canMoney.compareTo(BigDecimal.ZERO) > 0) {
+ canMoney = canMoney.subtract(profit);
+ }
+ }
+ return canMoney;
+ }
+
+ @Override
+ public List<MallMember> findRankList(RankListDto rankListDto) {
+ IPage<MallMember> page = new Page<>(rankListDto.getPageNum(), rankListDto.getPageSize());
+
+ MallMember member = new MallMember();
+ member.setQuery("2");
+ member.setCreatedTime(new Date());
+ IPage<MallMember> list = this.baseMapper.selectRankListInPage(page, member);
+
+ List<MallMember> records = list.getRecords();
+ if (CollUtil.isNotEmpty(records)) {
+ BigDecimal amount = records.get(records.size() - 1).getAmount();
+ page.setSize(999);
+ member.setAmount(amount);
+
+ IPage<MallMember> amountList = this.baseMapper.selectRankListInPage(page, member);
+ if (CollUtil.isNotEmpty(amountList.getRecords())) {
+ Map<Long, Object> map = new HashMap<>();
+ for (MallMember record : records) {
+ map.put(record.getId(), record);
+ }
+
+ for (MallMember record : amountList.getRecords()) {
+ if (map.get(record.getId()) == null) {
+ records.add(record);
+ }
+ }
+ }
+ }
+ return records;
+ }
}
--
Gitblit v1.9.1