From 608eb7c54095846d38e7f4e773f5f8eb21016ef6 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sun, 26 Sep 2021 17:39:20 +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 | 173 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 157 insertions(+), 16 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 ca6e862..3799ce2 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,26 +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.ForgetPwdDto;
-import cc.mrbird.febs.mall.dto.LoginDto;
-import cc.mrbird.febs.mall.dto.ModifyMemberInfoDto;
-import cc.mrbird.febs.mall.dto.RegisterDto;
-import cc.mrbird.febs.mall.entity.MallMember;
-import cc.mrbird.febs.mall.entity.MallMemberWallet;
-import cc.mrbird.febs.mall.entity.MallShoppingCart;
-import cc.mrbird.febs.mall.mapper.MallMemberMapper;
-import cc.mrbird.febs.mall.mapper.MallMemberWalletMapper;
-import cc.mrbird.febs.mall.mapper.MallOrderInfoMapper;
-import cc.mrbird.febs.mall.mapper.MallShoppingCartMapper;
+import cc.mrbird.febs.mall.dto.*;
+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.TeamListVo;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
@@ -29,6 +23,8 @@
import cn.hutool.crypto.asymmetric.KeyType;
import cn.hutool.crypto.asymmetric.RSA;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -55,6 +51,10 @@
private final RedisUtils redisUtils;
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;
@@ -97,7 +97,7 @@
mallMember.setName(registerDto.getAccount());
mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_ENABLE);
mallMember.setAccountType(MallMember.ACCOUNT_TYPE_NORMAL);
- mallMember.setLevel("1");
+ mallMember.setLevel(AgentLevelEnum.FIRST_LEVEL.name());
mallMember.setSex("男");
this.baseMapper.insert(mallMember);
@@ -208,6 +208,24 @@
MallMemberVo mallMemberVo = MallMemberConversion.INSTANCE.entityToVo(mallMember);
+ MallMember referMember = this.baseMapper.selectInfoByInviteId(mallMember.getReferrerId());
+ if (referMember != null) {
+ 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());
return new FebsResponse().success().data(mallMemberVo);
@@ -264,4 +282,127 @@
this.baseMapper.updateById(mallMember);
return new FebsResponse().success().message("修改成功");
}
+
+ @Override
+ public FebsResponse teamList(TeamListDto teamListDto) {
+ Long memberId = null;
+ if (teamListDto.getId() == null) {
+ memberId = LoginUserUtil.getLoginUser().getId();
+ } else {
+ memberId = teamListDto.getId();
+ }
+
+ MallMember mallMember = this.baseMapper.selectById(memberId);
+
+ List<TeamListVo> list = this.baseMapper.selectTeamListByInviteId(mallMember.getInviteId());
+ BigDecimal ownAmount = this.baseMapper.selectOwnOrderAmountByInviteId(mallMember.getInviteId());
+
+ TeamListVo own = new TeamListVo();
+ own.setCreatedTime(mallMember.getCreatedTime());
+ own.setAmount(ownAmount);
+ own.setName(mallMember.getName());
+ own.setPhone(mallMember.getPhone());
+ own.setInviteId(mallMember.getInviteId());
+ own.setIsCurrent(1);
+ own.setCnt(this.baseMapper.selectOwnCntByInviteId(mallMember.getInviteId()));
+ own.setOrderCnt(this.baseMapper.selectOwnOrderCntByInviteId(mallMember.getInviteId()));
+ own.setId(mallMember.getId());
+ list.add(0, own);
+ return new FebsResponse().success().data(list);
+ }
+
+ @Override
+ public FebsResponse moneyFlows(MoneyFlowDto moneyFlowDto) {
+ IPage<MoneyFlowVo> page = new Page<>(moneyFlowDto.getPageNum(), moneyFlowDto.getPageSize());
+ Long id = LoginUserUtil.getLoginUser().getId();
+ moneyFlowDto.setMemberId(id);
+ IPage<MoneyFlowVo> pages = mallMoneyFlowMapper.selectApiMoneyFlowInPage(page, moneyFlowDto);
+ return new FebsResponse().success().data(pages);
+ }
+
+ @Override
+ public void addMoneyFlow(Long memberId, BigDecimal amount, Integer type, String orderNo, String description, String remark, Long rtMemberId, Integer status) {
+ MallMoneyFlow flow = new MallMoneyFlow();
+ flow.setMemberId(memberId);
+ flow.setAmount(amount);
+ flow.setType(type);
+ flow.setOrderNo(orderNo);
+ flow.setDescription(description);
+ flow.setRemark(remark);
+ flow.setRtMemberId(rtMemberId);
+ 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 (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("未设置收款方式");
+ }
+
+ 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());
+ }
}
--
Gitblit v1.9.1