20200721 daiamtijiao

xiaoyong931011

2020-07-21 b86ee5977a11e1f119e7fb118fa6f28bb604a834

 src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java

@@ -165,6 +165,20 @@
      

      if (records != null) {

            for (ContractHoldOrderEntity holdOrderEntity : records) {

            	
               Long memberId = holdOrderEntity.getMemberId();

            Map<String, Object> columnMap = new HashMap<>();

            columnMap.put("member_id", memberId);

            List<MemberAuthenticationEntity> selectByMap = memberAuthenticationMapper.selectByMap(columnMap );

            if(selectByMap != null && selectByMap.size() > 0) {

               MemberAuthenticationEntity memberAuthenticationEntity = selectByMap.get(0);

               String firstName = memberAuthenticationEntity.getFirstName();

               String secondName = memberAuthenticationEntity.getSecondName();

               String realName = firstName + secondName;

               holdOrderEntity.setRealName(realName);

            }

            	
            	
               MemberEntity selectById = memberMapper.selectById(holdOrderEntity.getMemberId());

                // 获取最新价

                BigDecimal newPrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(holdOrderEntity.getSymbol())));

@@ -202,6 +216,22 @@
         QueryRequest request) {

      Page<ContractOrderEntity> page = new Page<>(request.getPageNum(), request.getPageSize());

      IPage<ContractOrderEntity> findMemberAccountInfoListInPage = contractHoldOrderMapper.findHistoryOrderInfoAloneInfoInPage(page, contractOrderEntity);

      List<ContractOrderEntity> records = findMemberAccountInfoListInPage.getRecords();

      if(records != null && records.size() > 0) {

         for(ContractOrderEntity contractOrderEntitys : records) {

            Long memberId = contractOrderEntitys.getMemberId();

            Map<String, Object> columnMap = new HashMap<>();

            columnMap.put("member_id", memberId);

            List<MemberAuthenticationEntity> selectByMap = memberAuthenticationMapper.selectByMap(columnMap );

            if(selectByMap != null && selectByMap.size() > 0) {

               MemberAuthenticationEntity memberAuthenticationEntity = selectByMap.get(0);

               String firstName = memberAuthenticationEntity.getFirstName();

               String secondName = memberAuthenticationEntity.getSecondName();

               String realName = firstName + secondName;

               contractOrderEntitys.setRealName(realName);

            }

         }

      }

      return findMemberAccountInfoListInPage;

   }



@@ -214,6 +244,7 @@
      

      List<MemberAccountMoneyChangeEntity> records = findMemberAccountInfoListInPage.getRecords();

      if(records != null && records.size() > 0) {

         String selectYJByMemberId = agentReturnMapper.selectYJByMemberId();

         for(MemberAccountMoneyChangeEntity accountMoneyChangeEntity : records) {

            Long memberId = accountMoneyChangeEntity.getMemberId();

            String allAmount = memberAccountMoneyChangeMapper.selectAccountMoneyChangeByMemberId(memberId);

@@ -228,11 +259,54 @@
               accountMoneyChangeEntity.setRealName(realName);

            }

            accountMoneyChangeEntity.setAllAmount(allAmount);

            if(memberId == 8) {

               accountMoneyChangeEntity.setAmount(BigDecimal.ZERO);

               accountMoneyChangeEntity.setAllAmount(selectYJByMemberId);

            }

         }

      }

		
      return findMemberAccountInfoListInPage;

   }



   @Override

   public IPage<MemberAccountInfoVo> findmemberAccountInfoAloneListInPage(MemberEntity memberEntity,

         QueryRequest request) {

      Page<MemberEntity> page = new Page<>(request.getPageNum(), request.getPageSize());

      IPage<MemberAccountInfoVo> selectMemberListInPage = memberMapper.findMemberAccountInfoAloneListInPage(page, memberEntity);

      List<MemberAccountInfoVo> records = selectMemberListInPage.getRecords();

      if(records.size() > 0) {

         for(MemberAccountInfoVo memberAccountInfoVo : records) {

            Long memberId = memberAccountInfoVo.getId();

            Map<String, Object> columnMap = new HashMap<>();

            columnMap.put("member_id", memberId);

            List<MemberAuthenticationEntity> selectByMap = memberAuthenticationMapper.selectByMap(columnMap );

            if(selectByMap != null && selectByMap.size() > 0) {

               MemberAuthenticationEntity memberAuthenticationEntity = selectByMap.get(0);

               String firstName = memberAuthenticationEntity.getFirstName();

               String secondName = memberAuthenticationEntity.getSecondName();

               String realName = firstName + secondName;

               memberAccountInfoVo.setRealName(realName);

            }

            //总盈亏

            String rewardratioByMid = memberMapper.selectRewardratioForBasicRealDataBymid(memberId);

              BigDecimal bd=new BigDecimal(rewardratioByMid);

            memberAccountInfoVo.setRewardratioByMid(bd);

            String inviteId = memberMapper.selectAgentForAccount(memberId);

            if("".equals(inviteId) || inviteId == null) {

               memberAccountInfoVo.setIsSuAccount(0);

            }else {

               memberAccountInfoVo.setIsSuAccount(1);

            }

            List<MemberWalletAgentEntity> selectByMaps = memberWalletAgentMapper.selectByMap(columnMap);

            if(selectByMaps.size() > 0) {

               BigDecimal availableBalance = selectByMaps.get(0).getAvailableBalance();

               memberAccountInfoVo.setAgentAvailableBalance(availableBalance);

            }

				
         }

      }

        return selectMemberListInPage;

   }