From 7e6bbd05a75b07cb0717812d0b51aad128361012 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 19 May 2022 18:43:42 +0800
Subject: [PATCH] fix some problem

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java |   31 +++++++++++++++----------------
 1 files changed, 15 insertions(+), 16 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 9001cfc..100b886 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
@@ -112,6 +112,7 @@
         mallMember.setAccountType(MallMember.ACCOUNT_TYPE_NORMAL);
         mallMember.setLevel(AgentLevelEnum.FIRST_LEVEL.name());
         mallMember.setSex("男");
+        mallMember.setBindPhone(registerDto.getAccount());
 
         this.baseMapper.insert(mallMember);
 
@@ -313,25 +314,23 @@
         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);
+//        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());
 
         MyTeamVo myTeamVo = new MyTeamVo();
         myTeamVo.setTeam(list);
-        myTeamVo.setMyAchieve(BigDecimal.valueOf(100));
-        myTeamVo.setMyTeamAchieve(BigDecimal.valueOf(100));
-        myTeamVo.setMyTeamCnt(100);
+        myTeamVo.setMyAchieve(this.baseMapper.selectAchieveByMemberId(mallMember.getInviteId(), 1));
+        myTeamVo.setMyTeamAchieve(this.baseMapper.selectAchieveByMemberId(mallMember.getInviteId(), 2));
+        myTeamVo.setMyTeamCnt(list.size());
         return new FebsResponse().success().data(myTeamVo);
     }
 

--
Gitblit v1.9.1