From dde5ffcf56ba046b8f1870ad148341519f8d469a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 24 Sep 2021 19:04:46 +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 | 176 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 172 insertions(+), 4 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 8b3273e..979c1f7 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
@@ -3,14 +3,22 @@
import cc.mrbird.febs.common.entity.FebsResponse;
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.mall.dto.LoginDto;
-import cc.mrbird.febs.mall.dto.RegisterDto;
+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.mapper.MallMemberMapper;
+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.mapper.*;
import cc.mrbird.febs.mall.service.IApiMallMemberService;
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;
import cn.hutool.core.util.StrUtil;
@@ -18,12 +26,16 @@
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;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.math.BigDecimal;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -37,12 +49,17 @@
@RequiredArgsConstructor
public class ApiMallMemberServiceImpl extends ServiceImpl<MallMemberMapper, MallMember> implements IApiMallMemberService {
+ private final MallMemberWalletMapper mallMemberWalletMapper;
private final ICommonService commonService;
private final RedisUtils redisUtils;
+ private final MallOrderInfoMapper mallOrderInfoMapper;
+ private final MallShoppingCartMapper mallShoppingCartMapper;
+ private final MallMoneyFlowMapper mallMoneyFlowMapper;
@Value("${spring.profiles.active}")
private String active;
+ @Transactional(rollbackFor = Exception.class)
@Override
public FebsResponse register(RegisterDto registerDto) {
MallMember mallMember = this.baseMapper.selectInfoByAccount(registerDto.getAccount());
@@ -103,7 +120,7 @@
break;
}
parentId = parentMember.getReferrerId();
- if (parentMember.getReferrerId().equals(parentMember.getInviteId())) {
+ if (StrUtil.isBlank(parentMember.getReferrerId())) {
flag = true;
}
}
@@ -112,6 +129,11 @@
mallMember.setReferrerIds(ids);
}
this.baseMapper.updateById(mallMember);
+
+ MallMemberWallet wallet = new MallMemberWallet();
+ wallet.setBalance(BigDecimal.ZERO);
+ wallet.setMemberId(mallMember.getId());
+ mallMemberWalletMapper.insert(wallet);
return new FebsResponse().success().message("注册成功");
}
@@ -152,4 +174,150 @@
RSA rsa = new RSA(null, AppContants.PUBLIC_KEY);
return rsa.encryptBase64(token + "_" + System.currentTimeMillis(), KeyType.PublicKey);
}
+
+ @Override
+ public FebsResponse forgetPwd(ForgetPwdDto forgetPwdDto) {
+ MallMember mallMember = this.baseMapper.selectInfoByAccount(forgetPwdDto.getAccount());
+ if (mallMember == null) {
+ throw new FebsException("账号不存在");
+ }
+
+ boolean b = commonService.verifyCode(forgetPwdDto.getAccount(), forgetPwdDto.getCode());
+ if (!b) {
+ throw new FebsException("验证码错误");
+ }
+
+ String pwd = SecureUtil.md5(forgetPwdDto.getPassword());
+ mallMember.setPassword(pwd);
+
+ this.baseMapper.updateById(mallMember);
+ return new FebsResponse().success().message("重置成功");
+ }
+
+ @Override
+ public FebsResponse logout() {
+ Long id = LoginUserUtil.getLoginUser().getId();
+ redisUtils.del(AppContants.APP_LOGIN_PREFIX + id);
+ return new FebsResponse().success().message("退出登录");
+ }
+
+ @Override
+ public FebsResponse findMemberInfo() {
+ Long id = LoginUserUtil.getLoginUser().getId();
+ MallMember mallMember = this.baseMapper.selectById(id);
+
+ MallMemberVo mallMemberVo = MallMemberConversion.INSTANCE.entityToVo(mallMember);
+
+ MallMember referMember = this.baseMapper.selectInfoByInviteId(mallMember.getReferrerId());
+ if (referMember != null) {
+ mallMemberVo.setReferrerName(referMember.getName());
+ }
+
+ MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(mallMemberVo.getId());
+ mallMemberVo.setBalance(wallet.getBalance());
+ return new FebsResponse().success().data(mallMemberVo);
+ }
+
+ @Override
+ public FebsResponse findMemberMarkCnt() {
+ Long id = LoginUserUtil.getLoginUser().getId();
+
+ List<Map<String, Integer>> maps = mallOrderInfoMapper.selectMemberOrderStatusCnt(id);
+ Map<Integer, Integer> orderCnt = new HashMap<>();
+ if (CollUtil.isNotEmpty(maps)) {
+ for (Map<String, Integer> map : maps) {
+ orderCnt.put(map.get("status"), map.get("cnt"));
+ }
+ }
+
+ List<MallShoppingCart> carts = mallShoppingCartMapper.selectCartGoodsList(id);
+ Map<String, Object> result = new HashMap<>();
+ result.put("order", orderCnt);
+ result.put("carts", carts.size());
+ return new FebsResponse().success().data(result);
+ }
+
+ @Override
+ public FebsResponse setTradePwd(ForgetPwdDto forgetPwdDto) {
+ MallMember mallMember = this.baseMapper.selectInfoByAccount(forgetPwdDto.getAccount());
+ if (mallMember == null) {
+ throw new FebsException("账号不存在");
+ }
+
+ boolean b = commonService.verifyCode(forgetPwdDto.getAccount(), forgetPwdDto.getCode());
+ if (!b) {
+ throw new FebsException("验证码错误");
+ }
+
+ mallMember.setTradePassword(SecureUtil.md5(forgetPwdDto.getPassword()));
+ this.baseMapper.updateById(mallMember);
+ return new FebsResponse().success().message("设置成功");
+ }
+
+ @Override
+ public FebsResponse modifyMemberInfo(ModifyMemberInfoDto modifyMemberInfoDto) {
+ MallMember member = LoginUserUtil.getLoginUser();
+ MallMember mallMember = this.baseMapper.selectById(member.getId());
+ if (StrUtil.isNotBlank(modifyMemberInfoDto.getName())) {
+ mallMember.setName(modifyMemberInfoDto.getName());
+ }
+
+ if (StrUtil.isNotBlank(modifyMemberInfoDto.getPhoto())) {
+ mallMember.setAvatar(modifyMemberInfoDto.getPhoto());
+ }
+
+ 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);
+ }
}
--
Gitblit v1.9.1