xiaoyong931011
2020-07-30 0c89a2588a6b69465e3c065ddea0a02d7c6535f0
src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java
@@ -62,6 +62,7 @@
import com.xcong.excoin.utils.RedisUtils;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import lombok.extern.slf4j.Slf4j;
@@ -121,6 +122,19 @@
        List<FollowTraderProfitInfoVo> followTraderProfitInfoVoList = followTraderProfitInfoList.getRecords();
        if(CollUtil.isNotEmpty(followTraderProfitInfoVoList)) {
           for(FollowTraderProfitInfoVo FollowTraderProfitInfoVo : followTraderProfitInfoVoList) {
              MemberEntity user = LoginUserUtils.getUser();
              if(ObjectUtil.isNotEmpty(user)) {
                 Long traderId = FollowTraderProfitInfoVo.getTraderId();
                 Long memberId = user.getId();
                 FollowFollowerProfitEntity followFollowerProfitEntity = followFollowerProfitDao.selectDocumentaryOrderSetInfoBymemberIdAndTradeId(memberId, traderId);
                 if(ObjectUtil.isNotEmpty(followFollowerProfitEntity)) {
                    FollowTraderProfitInfoVo.setDocumentaaryType(1);
                 }else {
                    FollowTraderProfitInfoVo.setDocumentaaryType(2);
                 }
              }else {
                 FollowTraderProfitInfoVo.setDocumentaaryType(2);
              }
              Long traderId = FollowTraderProfitInfoVo.getTraderId();
              FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectFollowTraderInfoEntityBytreaderId(traderId);
              String avatar = followTraderInfoEntity.getAvatar();
@@ -131,8 +145,6 @@
              FollowTraderProfitInfoVo.setDeclaration(declaration);
              Integer isAll = followTraderInfoEntity.getIsAll();
              FollowTraderProfitInfoVo.setIsAll(isAll);
              Integer isOpen = followTraderInfoEntity.getIsOpen();
              FollowTraderProfitInfoVo.setIsOpen(isOpen);
           }
        }
      return Result.ok(followTraderProfitInfoVoList);
@@ -141,8 +153,11 @@
   @Override
   public Result getHistoryOrderRecords(@Valid HistoryOrderRecordsDto historyOrderRecordsDto) {
      
      FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectById(historyOrderRecordsDto.getTradeId());
      Long memberId = followTraderInfoEntity.getMemberId();
      Page<HistoryOrderRecordsVo> page = new Page<>(historyOrderRecordsDto.getPageNum(), historyOrderRecordsDto.getPageSize());
        IPage<HistoryOrderRecordsVo> historyOrderRecordsVoList = followTraderProfitInfoDao.selectHistoryOrderRecords(page, historyOrderRecordsDto.getMemberId());
        IPage<HistoryOrderRecordsVo> historyOrderRecordsVoList = followTraderProfitInfoDao.selectHistoryOrderRecords(page, memberId);
      return Result.ok(historyOrderRecordsVoList);
   }