From d867207d4bf46378718927444c7cef404b4a6a03 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 24 Sep 2021 15:19:50 +0800
Subject: [PATCH] 20210924
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 76 +++++++++++++++++++++++++++++++++++++-
1 files changed, 74 insertions(+), 2 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 0483305..ca6e862 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
@@ -9,12 +9,19 @@
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.service.IApiMallMemberService;
import cc.mrbird.febs.mall.service.ICommonService;
import cc.mrbird.febs.mall.vo.MallMemberVo;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
@@ -27,7 +34,9 @@
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;
@@ -41,12 +50,16 @@
@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;
@Value("${spring.profiles.active}")
private String active;
+ @Transactional(rollbackFor = Exception.class)
@Override
public FebsResponse register(RegisterDto registerDto) {
MallMember mallMember = this.baseMapper.selectInfoByAccount(registerDto.getAccount());
@@ -107,7 +120,7 @@
break;
}
parentId = parentMember.getReferrerId();
- if (parentMember.getReferrerId().equals(parentMember.getInviteId())) {
+ if (StrUtil.isBlank(parentMember.getReferrerId())) {
flag = true;
}
}
@@ -116,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("注册成功");
}
@@ -189,7 +207,61 @@
MallMember mallMember = this.baseMapper.selectById(id);
MallMemberVo mallMemberVo = MallMemberConversion.INSTANCE.entityToVo(mallMember);
- return new FebsResponse().data(mallMemberVo);
+
+ 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("修改成功");
+ }
}
--
Gitblit v1.9.1