From cad69fd8620d6317fe09efdd4eee730bf8e2d053 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 22 Sep 2021 17:53:15 +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 134b87a..c796705 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
@@ -6,13 +6,17 @@
 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.conversion.MallMemberConversion;
 import cc.mrbird.febs.mall.dto.ForgetPwdDto;
 import cc.mrbird.febs.mall.dto.LoginDto;
 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.mapper.MallMemberMapper;
+import cc.mrbird.febs.mall.mapper.MallMemberWalletMapper;
 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.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -25,7 +29,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;
@@ -39,12 +45,14 @@
 @RequiredArgsConstructor
 public class ApiMallMemberServiceImpl extends ServiceImpl<MallMemberMapper, MallMember> implements IApiMallMemberService {
 
+    private MallMemberWalletMapper mallMemberWalletMapper;
     private final ICommonService commonService;
     private final RedisUtils redisUtils;
 
     @Value("${spring.profiles.active}")
     private String active;
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public FebsResponse register(RegisterDto registerDto) {
         MallMember mallMember = this.baseMapper.selectInfoByAccount(registerDto.getAccount());
@@ -114,6 +122,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("注册成功");
     }
 
@@ -181,4 +194,13 @@
         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);
+        return new FebsResponse().data(mallMemberVo);
+    }
+
 }

--
Gitblit v1.9.1