From c5d6c4c5e7651330ab97d2ac445c3d27159ce264 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 29 Jul 2020 17:31:22 +0800
Subject: [PATCH] Merge branch 'master' into follow
---
src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 55 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..c3b5bc5 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,35 @@
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.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.entity.MemberAccountMoneyChange;
+import com.xcong.excoin.modules.coin.entity.OrderCoinsDealEntity;
+import com.xcong.excoin.modules.coin.parameter.dto.RecordsPageDto;
+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.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.FollowTraderProfitInfoVo;
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 +38,12 @@
@Resource
private MemberDao memberDao;
+ @Resource
+ private FollowTraderInfoDao followTraderInfoDao;
+ @Resource
+ private FollowTraderProfitDetailDao followTraderProfitDetailDao;
+ @Resource
+ private FollowTraderProfitInfoDao followTraderProfitInfoDao;
@Override
public Result getMemberIsTradeInfo() {
@@ -39,4 +61,37 @@
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 getWalletAgentIntoRecords(@Valid HistoryOrderRecordsDto historyOrderRecordsDto) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
}
--
Gitblit v1.9.1