fix conflect

Helius

2020-07-31 829d77f7145514d67d957ad54dbef854440f77d3

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

@@ -10,6 +10,7 @@
import javax.annotation.Resource;

import javax.validation.Valid;



import org.apache.http.impl.NoConnectionReuseStrategy;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;



@@ -254,6 +255,14 @@
           if(CollUtil.isNotEmpty(records)) {

              for(ContractOrderEntity contractOrderEntity : records) {

                 MyFollowOrderVo myFollowOrderVo = new MyFollowOrderVo();

                 //获取交易员信息

               Long orderId = contractOrderEntity.getId();

               FollowFollowerOrderRelationEntity FollowFollowerOrderRelation = followFollowerOrderRelationDao.selectHistoryOneByorderId(orderId);

               Long tradeId = FollowFollowerOrderRelation.getTradeId();

               FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectById(tradeId);

               String nickname = followTraderInfoEntity.getNickname();

               myFollowOrderVo.setNickname(nickname);

        			
                 String symbol = contractOrderEntity.getSymbol();

                 myFollowOrderVo.setSymbol(symbol);

                 int orderType = contractOrderEntity.getOrderType();

@@ -301,7 +310,7 @@
               MyFollowOrderVo myFollowOrderVo = new MyFollowOrderVo();

               //获取交易员信息

               Long orderId = contractHoldOrderEntity.getId();

               FollowFollowerOrderRelationEntity FollowFollowerOrderRelation = followFollowerOrderRelationDao.selectOneByorderIdandMemberId(orderId,memberId);

               FollowFollowerOrderRelationEntity FollowFollowerOrderRelation = followFollowerOrderRelationDao.selectNowOneByorderId(orderId);

               Long tradeId = FollowFollowerOrderRelation.getTradeId();

               FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectById(tradeId);

               String nickname = followTraderInfoEntity.getNickname();

@@ -365,9 +374,7 @@
   public Result getMyFollowTraderInfo(@Valid MyFollowTraderInfoDto myFollowTraderInfoDto) {

      //获取用户ID

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

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

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

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

        

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

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

@@ -389,7 +396,7 @@
              myFollowOrderVos.add(myFollowTraderInfoVo);

           }

      }

      return Result.ok(result);

      return Result.ok(myFollowOrderVos);

   }



   @Override