20200721 代码提交

xiaoyong931011

2020-07-21 0c95f99dae780bc2552c27489ac5468d003239f5

 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;

   }



@@ -212,15 +242,9 @@
      IPage<MemberAccountMoneyChangeEntity> findMemberAccountInfoListInPage = 

            memberAccountMoneyChangeMapper.findMemberAgentReturnInfoAloneInPage(page, memberAccountMoneyChangeEntity);

      

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

      columnMaps.put("member_id", 8);

      List<MemberAccountMoneyChangeEntity> selectByMap2 = memberAccountMoneyChangeMapper.selectByMap(columnMaps);

      MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity2 = selectByMap2.get(0);

      String selectYJByMemberId = agentReturnMapper.selectYJByMemberId();

      memberAccountMoneyChangeEntity2.setAllAmount(selectYJByMemberId);

		
      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);

@@ -235,9 +259,12 @@
               accountMoneyChangeEntity.setRealName(realName);

            }

            accountMoneyChangeEntity.setAllAmount(allAmount);

            if(memberId == 8) {

               accountMoneyChangeEntity.setAmount(BigDecimal.ZERO);

               accountMoneyChangeEntity.setAllAmount(selectYJByMemberId);

            }

         }

      }

      records.add(memberAccountMoneyChangeEntity2);

      return findMemberAccountInfoListInPage;

   }