20200730 代碼提交

xiaoyong931011

2020-07-30 e8eccc34b4b1df20e2e81e304073421523894c31

 src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java

@@ -94,8 +94,8 @@
   public Result getFollowTraderProfitInfo(@Valid RecordsPageDto recordsPageDto) {

        

        Page<FollowTraderProfitInfoVo> page = new Page<>(recordsPageDto.getPageNum(), recordsPageDto.getPageSize());

        FollowTraderProfitInfoEntity memberAccountMoneyChange = new FollowTraderProfitInfoEntity();

        IPage<FollowTraderProfitInfoVo> followTraderProfitInfoList = followTraderProfitInfoDao.selectFollowTraderProfitInfoEntity(page, memberAccountMoneyChange);

        FollowTraderProfitInfoEntity followTraderProfitInfoEntity = new FollowTraderProfitInfoEntity();

        IPage<FollowTraderProfitInfoVo> followTraderProfitInfoList = followTraderProfitInfoDao.selectFollowTraderProfitInfoEntity(page, followTraderProfitInfoEntity);

        

        List<FollowTraderProfitInfoVo> followTraderProfitInfoVoList = followTraderProfitInfoList.getRecords();

        if(CollUtil.isNotEmpty(followTraderProfitInfoVoList)) {

@@ -134,15 +134,12 @@
      List<FollowRecordsVo> records = historyOrderRecordsVoList.getRecords();

      if(CollUtil.isNotEmpty(records)) {

         for(FollowRecordsVo followRecordsVo : records) {

            Long memberId =followRecordsVo.getMemberId();

            MemberEntity member = memberDao.selectById(memberId);

            String email = member.getEmail();

            String phone = member.getPhone();

            if(StrUtil.isNotEmpty(email)) {

               followRecordsVo.setAccount(email);

            }else {

               followRecordsVo.setAccount(phone);

            }

            Long tradeId = followRecordsVo.getTradeId();

            FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectById(tradeId);

            String avatar = followTraderInfoEntity.getAvatar();

            followRecordsVo.setAvatar(avatar);

            String nickname = followTraderInfoEntity.getNickname();

            followRecordsVo.setNickname(nickname);

         }

      }

      return Result.ok(historyOrderRecordsVoList);

@@ -324,14 +321,14 @@
      //获取用户ID

        Long memberId = LoginUserUtils.getAppLoginUser().getId();

        MemberEntity member = memberDao.selectById(memberId);

        
        Page<MyFollowTraderInfoVo> result = new Page<>();

        List<MyFollowTraderInfoVo> myFollowOrderVos = result.getRecords();

        
        Page<FollowFollowerProfitEntity> page = new Page<>(myFollowTraderInfoDto.getPageNum(), myFollowTraderInfoDto.getPageSize());

      IPage<FollowFollowerProfitEntity> followFollowerProfitEntitys = followFollowerProfitDao.selectFollowFollowerProfitEntitys(page, memberId);

        
      List<FollowFollowerProfitEntity> records = followFollowerProfitEntitys.getRecords();

      if(CollUtil.isNotEmpty(records)) {

         Page<MyFollowTraderInfoVo> result = new Page<>();

           List<MyFollowTraderInfoVo> myFollowOrderVos = result.getRecords();

	        
         for(FollowFollowerProfitEntity FollowFollowerProfitEntity : records) {

            MyFollowTraderInfoVo myFollowTraderInfoVo = new MyFollowTraderInfoVo();

            

@@ -339,10 +336,8 @@
            FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectById(tradeId);

            String avatar = followTraderInfoEntity.getAvatar();

            myFollowTraderInfoVo.setAvatar(avatar);

				
            String nickname = followTraderInfoEntity.getNickname();

            myFollowTraderInfoVo.setNickname(nickname);

				
            BigDecimal totalPrincipal = FollowFollowerProfitEntity.getTotalPrincipal();

            myFollowTraderInfoVo.setTotalPrincipal(totalPrincipal);

            

@@ -381,7 +376,7 @@
            myFollowOrderVos.add(myFollowTraderInfoVo);

         }

      }

      return null;

      return Result.ok(result);

   }