From c60bd59a4cb9db39f4339a08157f3662bd40c17d Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 24 Sep 2021 10:13:48 +0800
Subject: [PATCH] 20210924

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java |   39 +++++++++++++++++++++++++++++++++++++--
 1 files changed, 37 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..1bcf0cb 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
@@ -11,10 +11,16 @@
 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.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 +33,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 +49,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 +119,7 @@
                 break;
             }
             parentId = parentMember.getReferrerId();
-            if (parentMember.getReferrerId().equals(parentMember.getInviteId())) {
+            if (StrUtil.isBlank(parentMember.getReferrerId())) {
                 flag = true;
             }
         }
@@ -116,6 +128,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 +206,25 @@
         MallMember mallMember = this.baseMapper.selectById(id);
 
         MallMemberVo mallMemberVo = MallMemberConversion.INSTANCE.entityToVo(mallMember);
-        return new FebsResponse().data(mallMemberVo);
+        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);
+    }
 }

--
Gitblit v1.9.1