xiaoyong931011
2021-03-03 85432ec0106fe27c2b2dbad5fdf0ea822e038859
src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java
@@ -41,6 +41,7 @@
import com.xcong.excoin.modules.documentary.dto.DocumentaryOrderSetDto;
import com.xcong.excoin.modules.documentary.dto.FollowFollowerNoticeDto;
import com.xcong.excoin.modules.documentary.dto.FollowRecordsDto;
import com.xcong.excoin.modules.documentary.dto.FollowTraderProfitInfoDto;
import com.xcong.excoin.modules.documentary.dto.HistoryOrderRecordsDto;
import com.xcong.excoin.modules.documentary.dto.MyFollowOrderDto;
import com.xcong.excoin.modules.documentary.dto.MyFollowTraderInfoDto;
@@ -143,10 +144,14 @@
   }
   @Override
   public Result getFollowTraderProfitInfo(@Valid RecordsPageDto recordsPageDto) {
   public Result getFollowTraderProfitInfo(@Valid FollowTraderProfitInfoDto recordsPageDto) {
        
      int type = recordsPageDto.getType();
        Page<FollowTraderProfitInfoVo> page = new Page<>(recordsPageDto.getPageNum(), recordsPageDto.getPageSize());
        FollowTraderProfitInfoEntity followTraderProfitInfoEntity = new FollowTraderProfitInfoEntity();
        if(FollowTraderInfoEntity.IS_SETFRIST_Y.equals(type)) {
           followTraderProfitInfoEntity.setType(type);
        }
        IPage<FollowTraderProfitInfoVo> followTraderProfitInfoList = followTraderProfitInfoDao.selectFollowTraderProfitInfoEntity(page, followTraderProfitInfoEntity);
        
        List<FollowTraderProfitInfoVo> followTraderProfitInfoVoList = followTraderProfitInfoList.getRecords();
@@ -874,11 +879,11 @@
               TradeOrderInfoVo myFollowOrderVo = new TradeOrderInfoVo();
               //获取交易员信息
               Long orderId = contractHoldOrderEntity.getId();
               myFollowOrderVo.setOrderId(orderId);
               FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectTraderInfoByMemberId(memberId);
               if(ObjectUtil.isNotEmpty(followTraderInfoEntity)) {
                  myFollowOrderVo.setOrderId(orderId);
               String nickname = followTraderInfoEntity.getNickname();
               myFollowOrderVo.setNickname(nickname);
               String symbol = contractHoldOrderEntity.getSymbol();
               myFollowOrderVo.setSymbol(symbol);
               int orderType = contractHoldOrderEntity.getOpeningType();
@@ -928,6 +933,7 @@
               myFollowOrderVos.add(myFollowOrderVo);
            }
         }
         }
      
      return Result.ok(myFollowOrderVos);
   }