From fd7c15b0d7fff836fc26f1feaf72ccf7cb1f7efc Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Wed, 29 Jul 2020 17:31:30 +0800 Subject: [PATCH] Merge branch 'follow' of https://gitee.com/chonggaoxiao/new_excoin into follow --- src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java | 97 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 97 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java b/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java index 16bf169..f2c4ef9 100644 --- a/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java +++ b/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java @@ -1,19 +1,36 @@ package com.xcong.excoin.modules.documentary.service.impl; +import java.util.List; + import javax.annotation.Resource; +import javax.validation.Valid; import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.xcong.excoin.common.LoginUserUtils; import com.xcong.excoin.common.response.Result; +import com.xcong.excoin.modules.coin.dao.OrderCoinsDao; +import com.xcong.excoin.modules.coin.parameter.dto.RecordsPageDto; +import com.xcong.excoin.modules.documentary.dao.FollowFollowerProfitDao; +import com.xcong.excoin.modules.documentary.dao.FollowTraderInfoDao; +import com.xcong.excoin.modules.documentary.dao.FollowTraderProfitDetailDao; import com.xcong.excoin.modules.documentary.dao.FollowTraderProfitInfoDao; +import com.xcong.excoin.modules.documentary.dto.FollowRecordsDto; +import com.xcong.excoin.modules.documentary.dto.HistoryOrderRecordsDto; +import com.xcong.excoin.modules.documentary.entity.FollowTraderInfoEntity; import com.xcong.excoin.modules.documentary.entity.FollowTraderProfitInfoEntity; import com.xcong.excoin.modules.documentary.service.DocumentaryService; +import com.xcong.excoin.modules.documentary.vo.FollowRecordsVo; +import com.xcong.excoin.modules.documentary.vo.FollowTraderProfitInfoVo; +import com.xcong.excoin.modules.documentary.vo.HistoryOrderRecordsVo; import com.xcong.excoin.modules.documentary.vo.MemberIsTradeVo; import com.xcong.excoin.modules.member.dao.MemberDao; import com.xcong.excoin.modules.member.entity.MemberEntity; +import cn.hutool.core.collection.CollUtil; import lombok.extern.slf4j.Slf4j; @Slf4j @@ -22,6 +39,16 @@ @Resource private MemberDao memberDao; + @Resource + private FollowTraderInfoDao followTraderInfoDao; + @Resource + private FollowTraderProfitDetailDao followTraderProfitDetailDao; + @Resource + private FollowTraderProfitInfoDao followTraderProfitInfoDao; + @Resource + private FollowFollowerProfitDao followFollowerProfitDao; + @Resource + private OrderCoinsDao orderCoinsDao; @Override public Result getMemberIsTradeInfo() { @@ -39,4 +66,74 @@ return Result.ok(memberIsTradeVo); } + @Override + 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); + + List<FollowTraderProfitInfoVo> followTraderProfitInfoVoList = followTraderProfitInfoList.getRecords(); + if(CollUtil.isNotEmpty(followTraderProfitInfoVoList)) { + for(FollowTraderProfitInfoVo FollowTraderProfitInfoVo : followTraderProfitInfoVoList) { + Long traderId = FollowTraderProfitInfoVo.getTraderId(); + FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectFollowTraderInfoEntityBytreaderId(traderId); + String avatar = followTraderInfoEntity.getAvatar(); + FollowTraderProfitInfoVo.setAvatar(avatar); + String nickname = followTraderInfoEntity.getNickname(); + FollowTraderProfitInfoVo.setNickname(nickname); + String declaration = followTraderInfoEntity.getDeclaration(); + FollowTraderProfitInfoVo.setDeclaration(declaration); + Integer isAll = followTraderInfoEntity.getIsAll(); + FollowTraderProfitInfoVo.setIsAll(isAll); + Integer isOpen = followTraderInfoEntity.getIsOpen(); + FollowTraderProfitInfoVo.setIsOpen(isOpen); + } + } + return Result.ok(followTraderProfitInfoVoList); + } + + @Override + public Result getHistoryOrderRecords(@Valid HistoryOrderRecordsDto historyOrderRecordsDto) { + + Page<HistoryOrderRecordsVo> page = new Page<>(historyOrderRecordsDto.getPageNum(), historyOrderRecordsDto.getPageSize()); + IPage<HistoryOrderRecordsVo> historyOrderRecordsVoList = followTraderProfitInfoDao.selectHistoryOrderRecords(page, historyOrderRecordsDto.getMemberId()); + return Result.ok(historyOrderRecordsVoList); + } + + @Override + public Result getFollowRecords(@Valid FollowRecordsDto followRecordsDto) { + + Page<FollowRecordsVo> page = new Page<>(followRecordsDto.getPageNum(), followRecordsDto.getPageSize()); + IPage<FollowRecordsVo> historyOrderRecordsVoList = followFollowerProfitDao.selectFollowRecords(page, followRecordsDto.getTradeMemberId()); + return Result.ok(historyOrderRecordsVoList); + } + + + + + + + + + + + + + + + + + + + + + + + + + + + + } -- Gitblit v1.9.1