20200731 代码提交

xiaoyong931011

2020-07-31 5b825980be9965173b159209f71456e71447f57e

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

@@ -241,8 +241,7 @@
   public Result getHistoryMyFollowOrderRecords(@Valid MyFollowOrderDto myFollowOrderDto) {

      //获取用户ID

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

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

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

        List<MyFollowOrderVo> myFollowOrderVos = new ArrayList<>();

        //历史跟单

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

           IPage<ContractOrderEntity> contractOrderEntitys = followFollowerProfitDao.getMyFollowOrderHistoryRecords(page, memberId);

@@ -287,8 +286,7 @@
      Long memberId = LoginUserUtils.getAppLoginUser().getId();

      MemberEntity member = memberDao.selectById(memberId);

      

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

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

      List<MyFollowOrderVo> myFollowOrderVos = new ArrayList<>();

         //当前跟单   

         Page<ContractHoldOrderEntity> page = new Page<>(myFollowOrderDto.getPageNum(), myFollowOrderDto.getPageSize());

         IPage<ContractHoldOrderEntity> contractHoldOrderEntitys = followFollowerProfitDao.getMyFollowOrderNowRecords(page, memberId);

@@ -514,6 +512,22 @@
      

      return Result.ok(MessageSourceUtils.getString("member_service_0024"));

   }



   @Override

   public Result getFollowTraderProfit(long traderId) {

      FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectById(traderId);

      Long memberId = followTraderInfoEntity.getMemberId();

      FollowTraderProfitInfoVo followTraderProfitInfoVo = followTraderProfitInfoDao.selectOneByMemberId(memberId);

      String avatar = followTraderInfoEntity.getAvatar();

      String nickname = followTraderInfoEntity.getNickname();

      String declaration = followTraderInfoEntity.getDeclaration();

      Integer isAll = followTraderInfoEntity.getIsAll();

      followTraderProfitInfoVo.setAvatar(avatar);

      followTraderProfitInfoVo.setNickname(nickname);

      followTraderProfitInfoVo.setDeclaration(declaration);

      followTraderProfitInfoVo.setIsAll(isAll);

      return Result.ok(followTraderProfitInfoVo);

   }