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 |   30 +++++++++++++++++++++++++++---
 1 files changed, 27 insertions(+), 3 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 c796705..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
@@ -12,11 +12,15 @@
 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;
@@ -45,9 +49,11 @@
 @RequiredArgsConstructor
 public class ApiMallMemberServiceImpl extends ServiceImpl<MallMemberMapper, MallMember> implements IApiMallMemberService {
 
-    private MallMemberWalletMapper mallMemberWalletMapper;
+    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;
@@ -113,7 +119,7 @@
                 break;
             }
             parentId = parentMember.getReferrerId();
-            if (parentMember.getReferrerId().equals(parentMember.getInviteId())) {
+            if (StrUtil.isBlank(parentMember.getReferrerId())) {
                 flag = true;
             }
         }
@@ -200,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