20200715 代码提交

xiaoyong931011

2020-07-15 556717400f442495b77bbb16bbb4e1965763795f

 src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java

@@ -79,6 +79,47 @@
      Page<AgentFriendRelationEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
      IPage<AgentFriendRelationEntity> findmemberQuickBuySaleListInPage = agentFriendRelationMapper.findAgentFriendRelationListInPage(page, agentFriendRelationEntity);
      List<AgentFriendRelationEntity> records = findmemberQuickBuySaleListInPage.getRecords();
      List<AgentFriendRelationEntity> arraylist = new ArrayList<>();
      if(records != null && records.size() > 0) {
         for(AgentFriendRelationEntity agentFriendRelation : records) {
            String inviteId = agentFriendRelation.getInviteId();
            if("90457646".equals(inviteId)) {
               //该邀请码下的所有代理
               Map<String, Object> columnMap = new HashMap<>();
               columnMap.put("referer_id", "90457646");
               List<AgentFriendRelationEntity> selectByMap = agentFriendRelationMapper.selectByMap(columnMap);
					
               if(selectByMap != null && selectByMap.size() > 0) {
                  int i = 1;
                  for(AgentFriendRelationEntity agentFriendRelationEntityTeam : selectByMap){
                     agentFriendRelationEntityTeam.setTeam(i+"");
                     arraylist.add(agentFriendRelationEntityTeam);
                     String inviteIdTeam = agentFriendRelationEntityTeam.getInviteId();
                     // 当前邀请码下的所有代理MemberID
                     List<AgentFriendRelationEntity> lowLevelList = agentFriendRelationMapper.selectAgentFriendRelationByMap(inviteIdTeam);
                     if(lowLevelList != null && lowLevelList.size() > 0) {
                        for(AgentFriendRelationEntity lowLevelAgentFriendRelationEntity: lowLevelList) {
                           lowLevelAgentFriendRelationEntity.setTeam(i+"");
                           arraylist.add(lowLevelAgentFriendRelationEntity);
                        }
                     }
                     i++;
                  }
               }
            }
            if(arraylist != null && arraylist.size() > 0) {
               for(AgentFriendRelationEntity teamagentFriendRelationEntity : arraylist) {
                  if(inviteId.equals(teamagentFriendRelationEntity.getInviteId())) {
                     String team = teamagentFriendRelationEntity.getTeam();
                     agentFriendRelation.setTeam(team);
                  }
               }
            }
         }
      }
		
		
		
      
      if(records != null && records.size() > 0) {
         for(AgentFriendRelationEntity agentFriendRelation : records) {
@@ -140,7 +181,16 @@
    @Override
    public IPage<MemberEntity> findMemberListInPage(MemberEntity memberEntity, QueryRequest request) {
        Page<MemberEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
        return this.baseMapper.selectMemberListInPage(page, memberEntity);
        IPage<MemberEntity> selectMemberListInPage = this.baseMapper.selectMemberListInPage(page, memberEntity);
        List<MemberEntity> records = selectMemberListInPage.getRecords();
        if(records != null && records.size() > 0) {
           for(MemberEntity memberEntitys : records) {
              String firstName = (memberEntitys.getFirstName() == null ? "" : memberEntitys.getFirstName());
              String secondName = (memberEntitys.getSecondName() == null ? "" : memberEntitys.getSecondName());
              memberEntitys.setRealName(firstName+secondName);
           }
        }
        return selectMemberListInPage;
    }

   @Override
@@ -345,7 +395,17 @@
   public IPage<MemberCoinWithdrawVo> findmemberWithdrawCoinListInPage(
         MemberCoinWithdrawEntity memberCoinWithdrawEntity, QueryRequest request) {
      Page<MemberCoinWithdrawEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
		
      IPage<MemberCoinWithdrawVo> findmemberQuickBuySaleListInPage = memberCoinWithdrawMapper.findmemberWithdrawCoinListInPage(page, memberCoinWithdrawEntity);
      List<MemberCoinWithdrawVo> records = findmemberQuickBuySaleListInPage.getRecords();
      if(records != null && records.size() > 0) {
         for(MemberCoinWithdrawVo memberCoinWithdrawVo : records) {
            BigDecimal amount = memberCoinWithdrawVo.getAmount();
            BigDecimal feeAmount = memberCoinWithdrawVo.getFeeAmount();
            BigDecimal subtract = amount.subtract(feeAmount);
            memberCoinWithdrawVo.setRealAmount(subtract);
         }
      }
        return findmemberQuickBuySaleListInPage;
   }

@@ -519,8 +579,10 @@
      String closingpriceByMid = memberMapper.selectClosingpriceForBasicRealData();
      //平仓总手续费
      String sellClosingpriceByMid = memberMapper.selectSellClosingpriceForBasicRealData();
		
      //总盈亏
      String rewardratioByMid = memberMapper.selectRewardratioForBasicRealData();
		
      //持仓人数
      String notNullNumber = memberMapper.selectSFCCForBasicRealData();
      //币币账户不为空的人数