From 06643cf41d88a6b409fa666b4bfa95d3b8561cfd Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 05 Aug 2020 14:29:06 +0800
Subject: [PATCH] 20200805  代码提交

---
 src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java |  364 ++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 314 insertions(+), 50 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 44a35ad..f2199a3 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
@@ -10,7 +10,6 @@
 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;
 
@@ -36,7 +35,9 @@
 import com.xcong.excoin.modules.documentary.dto.HistoryOrderRecordsDto;
 import com.xcong.excoin.modules.documentary.dto.MyFollowOrderDto;
 import com.xcong.excoin.modules.documentary.dto.MyFollowTraderInfoDto;
+import com.xcong.excoin.modules.documentary.dto.TradeOrderInfoDto;
 import com.xcong.excoin.modules.documentary.dto.UpdateDocumentaryOrderSetDto;
+import com.xcong.excoin.modules.documentary.dto.UpdateTradeSetInfoDto;
 import com.xcong.excoin.modules.documentary.entity.FollowFollowerOrderRelationEntity;
 import com.xcong.excoin.modules.documentary.entity.FollowFollowerProfitEntity;
 import com.xcong.excoin.modules.documentary.entity.FollowFollowerSettingEntity;
@@ -52,6 +53,11 @@
 import com.xcong.excoin.modules.documentary.vo.MemberIsTradeVo;
 import com.xcong.excoin.modules.documentary.vo.MyFollowOrderVo;
 import com.xcong.excoin.modules.documentary.vo.MyFollowTraderInfoVo;
+import com.xcong.excoin.modules.documentary.vo.TradeHistoryOrderInfoVo;
+import com.xcong.excoin.modules.documentary.vo.TradeOrderInfoVo;
+import com.xcong.excoin.modules.documentary.vo.TradeProfitInfoVo;
+import com.xcong.excoin.modules.documentary.vo.TradeSetInfoVo;
+import com.xcong.excoin.modules.documentary.vo.TraderStatusVo;
 import com.xcong.excoin.modules.member.dao.MemberDao;
 import com.xcong.excoin.modules.member.dao.MemberLevelRateDao;
 import com.xcong.excoin.modules.member.dao.MemberWalletContractDao;
@@ -133,12 +139,10 @@
         			Long memberId = user.getId();
         			FollowFollowerProfitEntity followFollowerProfitEntity = followFollowerProfitDao.selectDocumentaryOrderSetInfoBymemberIdAndTradeId(memberId, traderId);
         			if(ObjectUtil.isNotEmpty(followFollowerProfitEntity)) {
-        				FollowTraderProfitInfoVo.setDocumentaaryType(1);
+        				FollowTraderProfitInfoVo.setDocumentaaryType(followFollowerProfitEntity.getIsFollow());
         			}else {
-        				FollowTraderProfitInfoVo.setDocumentaaryType(2);
-        			}
-        		}else {
-        			FollowTraderProfitInfoVo.setDocumentaaryType(2);
+            			FollowTraderProfitInfoVo.setDocumentaaryType(2);
+            		}
         		}
         		Long traderId = FollowTraderProfitInfoVo.getTraderId();
         		FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectFollowTraderInfoEntityBytreaderId(traderId);
@@ -257,6 +261,7 @@
         			MyFollowOrderVo myFollowOrderVo = new MyFollowOrderVo();
         			//获取交易员信息
 					Long orderId = contractOrderEntity.getId();
+					myFollowOrderVo.setOrderId(orderId);
 					FollowFollowerOrderRelationEntity FollowFollowerOrderRelation = followFollowerOrderRelationDao.selectHistoryOneByorderId(orderId);
 					Long tradeId = FollowFollowerOrderRelation.getTradeId();
 					FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectById(tradeId);
@@ -310,6 +315,7 @@
 					MyFollowOrderVo myFollowOrderVo = new MyFollowOrderVo();
 					//获取交易员信息
 					Long orderId = contractHoldOrderEntity.getId();
+					myFollowOrderVo.setOrderId(orderId);
 					FollowFollowerOrderRelationEntity FollowFollowerOrderRelation = followFollowerOrderRelationDao.selectNowOneByorderId(orderId);
 					Long tradeId = FollowFollowerOrderRelation.getTradeId();
 					FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectById(tradeId);
@@ -393,6 +399,8 @@
 				myFollowTraderInfoVo.setTotalPrincipal(totalPrincipal);
 				BigDecimal totalProfit = FollowFollowerProfitEntity.getTotalProfit();
 	        	myFollowTraderInfoVo.setTotalProfit(totalProfit.setScale(2, BigDecimal.ROUND_DOWN));
+
+				myFollowTraderInfoVo.setTradeId(tradeId);
 	        	myFollowOrderVos.add(myFollowTraderInfoVo);
 	        }
 		}
@@ -434,49 +442,65 @@
 	public Result getDocumentaryOrderSet(@Valid DocumentaryOrderSetDto documentaryOrderSetDto) {
 		//获取用户ID
         Long memberId = LoginUserUtils.getAppLoginUser().getId();
-        //新增【跟随者设置】数据
-        FollowFollowerSettingEntity followFollowerSettingEntity = new FollowFollowerSettingEntity();
-        followFollowerSettingEntity.setMemberId(memberId);
-        Long traderId = documentaryOrderSetDto.getTraderId();
-        followFollowerSettingEntity.setTradeId(traderId);
-        FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectById(traderId);
-        Long traderMemberId = followTraderInfoEntity.getMemberId();
-        followFollowerSettingEntity.setTradeMemberId(traderMemberId);
-        followFollowerSettingEntity.setSymbols(documentaryOrderSetDto.getSymbols());
-        followFollowerSettingEntity.setFollowType(documentaryOrderSetDto.getFollowType());
-        followFollowerSettingEntity.setFollowCnt(documentaryOrderSetDto.getFollowCnt());
-        followFollowerSettingEntity.setMaxFollowCnt(documentaryOrderSetDto.getMaxFollowCnt());
-        followFollowerSettingDao.insert(followFollowerSettingEntity);
-		//更新【跟随者收益】数据
-        Map<String, Object> columnMap = new HashMap<>();
-        columnMap.put("member_id", memberId);
-        List<FollowFollowerProfitEntity> selectByMap = followFollowerProfitDao.selectByMap(columnMap);
-        if(CollUtil.isNotEmpty(selectByMap)) {
-        	FollowFollowerProfitEntity followFollowerProfitEntity = selectByMap.get(0);
-        	followFollowerProfitEntity.setIsFollow(FollowFollowerProfitEntity.IS_FOLLOW_Y);
-        	followFollowerProfitDao.updateById(followFollowerProfitEntity);
-        }else {
-        	FollowFollowerProfitEntity followFollowerProfitEntity = new FollowFollowerProfitEntity();
-        	followFollowerProfitEntity.setMemberId(memberId);
-        	followFollowerProfitEntity.setTradeId(traderId);
-        	followFollowerProfitEntity.setTradeMemberId(traderMemberId);
-        	followFollowerProfitEntity.setTotalPrincipal(BigDecimal.ZERO);
-        	followFollowerProfitEntity.setTotalProfit(BigDecimal.ZERO);
-        	followFollowerProfitEntity.setIsFollow(FollowFollowerProfitEntity.IS_FOLLOW_Y);
-        	followFollowerProfitDao.insert(followFollowerProfitEntity);
-        }
+		Long traderId = documentaryOrderSetDto.getTraderId();
+
+		FollowTraderInfoEntity traderInfoEntity = followTraderInfoDao.selectTraderInfoByMemberId(memberId);
+		if (traderInfoEntity != null) {
+			return Result.fail("交易员不能进行跟单");
+		}
+
+		FollowFollowerSettingEntity isExistSetting = followFollowerSettingDao.selectOneBymemberIdAndTradeId(memberId, traderId);
+		if (isExistSetting == null) {
+			//新增【跟随者设置】数据
+			FollowFollowerSettingEntity followFollowerSettingEntity = new FollowFollowerSettingEntity();
+			followFollowerSettingEntity.setMemberId(memberId);
+			followFollowerSettingEntity.setTraderId(traderId);
+			FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectById(traderId);
+			Long traderMemberId = followTraderInfoEntity.getMemberId();
+			followFollowerSettingEntity.setTraderMemberId(traderMemberId);
+			followFollowerSettingEntity.setSymbols(documentaryOrderSetDto.getSymbols());
+			followFollowerSettingEntity.setFollowType(documentaryOrderSetDto.getFollowType());
+			followFollowerSettingEntity.setFollowCnt(documentaryOrderSetDto.getFollowCnt());
+			followFollowerSettingEntity.setMaxFollowCnt(documentaryOrderSetDto.getMaxFollowCnt());
+			followFollowerSettingDao.insert(followFollowerSettingEntity);
+			//更新【跟随者收益】数据
+			Map<String, Object> columnMap = new HashMap<>();
+			columnMap.put("member_id", memberId);
+			List<FollowFollowerProfitEntity> selectByMap = followFollowerProfitDao.selectByMap(columnMap);
+			if (CollUtil.isNotEmpty(selectByMap)) {
+				FollowFollowerProfitEntity followFollowerProfitEntity = selectByMap.get(0);
+				followFollowerProfitEntity.setIsFollow(FollowFollowerProfitEntity.IS_FOLLOW_Y);
+				followFollowerProfitDao.updateById(followFollowerProfitEntity);
+			} else {
+				FollowFollowerProfitEntity followFollowerProfitEntity = new FollowFollowerProfitEntity();
+				followFollowerProfitEntity.setMemberId(memberId);
+				followFollowerProfitEntity.setTradeId(traderId);
+				followFollowerProfitEntity.setTradeMemberId(traderMemberId);
+				followFollowerProfitEntity.setTotalPrincipal(BigDecimal.ZERO);
+				followFollowerProfitEntity.setTotalProfit(BigDecimal.ZERO);
+				followFollowerProfitEntity.setIsFollow(FollowFollowerProfitEntity.IS_FOLLOW_Y);
+				followFollowerProfitDao.insert(followFollowerProfitEntity);
+			}
+		} else {
+			isExistSetting.setSymbols(documentaryOrderSetDto.getSymbols());
+			isExistSetting.setFollowType(documentaryOrderSetDto.getFollowType());
+			isExistSetting.setFollowCnt(documentaryOrderSetDto.getFollowCnt());
+			isExistSetting.setMaxFollowCnt(documentaryOrderSetDto.getMaxFollowCnt());
+			followFollowerSettingDao.updateById(isExistSetting);
+		}
 		return Result.ok(MessageSourceUtils.getString("member_service_0024"));
 	}
 
 	@Override
-	public Result getDocumentaryOrderSetInfo() {
+	public Result getDocumentaryOrderSetInfo(String tradeId) {
 		//获取用户ID
         Long memberId = LoginUserUtils.getAppLoginUser().getId();
         DocumentaryOrderSetInfoVo documentaryOrderSetInfoVo = new DocumentaryOrderSetInfoVo();
+        long parseLong = Long.parseLong(tradeId);
         //获取【跟随者设置】数据
-        FollowFollowerSettingEntity followFollowerSettingEntity = followFollowerSettingDao.selectDocumentaryOrderSetInfoBymemberId(memberId);
-        Long tradeId = followFollowerSettingEntity.getTradeId();
-        documentaryOrderSetInfoVo.setTraderId(tradeId);
+        FollowFollowerSettingEntity followFollowerSettingEntity = followFollowerSettingDao.selectOneBymemberIdAndTradeId(memberId,parseLong);
+
+        documentaryOrderSetInfoVo.setTraderId(parseLong);
         
         FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectById(tradeId);
         String avatar = followTraderInfoEntity.getAvatar();
@@ -484,7 +508,11 @@
         
         String nickname = followTraderInfoEntity.getNickname();
         documentaryOrderSetInfoVo.setNickname(nickname);
-        
+
+		documentaryOrderSetInfoVo.setProfit(followTraderInfoEntity.getProfitRatio());
+        if (followFollowerSettingEntity == null) {
+        	return Result.ok(documentaryOrderSetInfoVo);
+		}
         String symbols = followFollowerSettingEntity.getSymbols();
         documentaryOrderSetInfoVo.setSymbols(symbols);
         
@@ -496,7 +524,6 @@
         
         Integer maxFollowCnt = followFollowerSettingEntity.getMaxFollowCnt();
         documentaryOrderSetInfoVo.setMaxFollowCnt(maxFollowCnt);
-        
         
 		return Result.ok(documentaryOrderSetInfoVo);
 	}
@@ -514,7 +541,7 @@
         FollowFollowerProfitEntity followFollowerProfitEntity = followFollowerProfitDao.selectDocumentaryOrderSetInfoBymemberIdAndTradeId(memberId,traderId);
         followFollowerProfitEntity.setIsFollow(FollowFollowerProfitEntity.IS_FOLLOW_N);
         followFollowerProfitDao.updateById(followFollowerProfitEntity);
-		return null;
+		return Result.ok(MessageSourceUtils.getString("documentary_service_0011"));
 	}
 
 	@Override
@@ -525,11 +552,24 @@
         Long traderId = updateDocumentaryOrderSetDto.getTraderId();
         //更新【跟随者设置】数据
         FollowFollowerSettingEntity followFollowerSettingEntity = followFollowerSettingDao.selectOneBymemberIdAndTradeId(memberId, traderId);
-        followFollowerSettingEntity.setSymbols(updateDocumentaryOrderSetDto.getSymbols());
-        followFollowerSettingEntity.setFollowType(updateDocumentaryOrderSetDto.getFollowType());
-        followFollowerSettingEntity.setFollowCnt(updateDocumentaryOrderSetDto.getFollowCnt());
-        followFollowerSettingEntity.setMaxFollowCnt(updateDocumentaryOrderSetDto.getMaxFollowCnt());
-        followFollowerSettingDao.updateById(followFollowerSettingEntity);
+        if (followFollowerSettingEntity == null) {
+        	FollowTraderInfoEntity traderInfoEntity = followTraderInfoDao.selectById(traderId);
+			followFollowerSettingEntity = new FollowFollowerSettingEntity();
+			followFollowerSettingEntity.setSymbols(updateDocumentaryOrderSetDto.getSymbols());
+			followFollowerSettingEntity.setFollowType(updateDocumentaryOrderSetDto.getFollowType());
+			followFollowerSettingEntity.setFollowCnt(updateDocumentaryOrderSetDto.getFollowCnt());
+			followFollowerSettingEntity.setMaxFollowCnt(updateDocumentaryOrderSetDto.getMaxFollowCnt());
+			followFollowerSettingEntity.setTraderId(traderId);
+			followFollowerSettingEntity.setMemberId(memberId);
+			followFollowerSettingEntity.setTraderMemberId(traderInfoEntity.getMemberId());
+			followFollowerSettingDao.insert(followFollowerSettingEntity);
+		} else {
+			followFollowerSettingEntity.setSymbols(updateDocumentaryOrderSetDto.getSymbols());
+			followFollowerSettingEntity.setFollowType(updateDocumentaryOrderSetDto.getFollowType());
+			followFollowerSettingEntity.setFollowCnt(updateDocumentaryOrderSetDto.getFollowCnt());
+			followFollowerSettingEntity.setMaxFollowCnt(updateDocumentaryOrderSetDto.getMaxFollowCnt());
+			followFollowerSettingDao.updateById(followFollowerSettingEntity);
+		}
 		
 		return Result.ok(MessageSourceUtils.getString("member_service_0024"));
 	}
@@ -558,8 +598,15 @@
         MemberEntity memberEntity = memberDao.selectById(memberId);
         Integer certifyStatus = memberEntity.getCertifyStatus();
         if(MemberEntity.CERTIFY_STATUS_Y != certifyStatus) {
-        	return Result.ok(MessageSourceUtils.getString("member_controller_0009"));
+        	return Result.fail(MessageSourceUtils.getString("member_controller_0009"));
         }
+        Map<String, Object> columnMap = new HashMap<>();
+        columnMap.put("member_id", memberId);
+		List<FollowTraderInfoEntity> selectByMap = followTraderInfoDao.selectByMap(columnMap);
+		if(CollUtil.isNotEmpty(selectByMap)) {
+			return Result.fail(MessageSourceUtils.getString("submit_repeat"));
+		}
+
         //新增【交易员信息表】数据
         FollowTraderInfoEntity followTraderInfoEntity = new FollowTraderInfoEntity();
         followTraderInfoEntity.setMemberId(memberId);
@@ -579,6 +626,223 @@
         followTraderInfoDao.insert(followTraderInfoEntity);
 		return Result.ok(MessageSourceUtils.getString("member_service_0024"));
 	}
+
+	@Override
+	public Result beTraderStatus() {
+		//获取用户ID
+        Long memberId = LoginUserUtils.getAppLoginUser().getId();
+        MemberEntity memberEntity = memberDao.selectById(memberId);
+        
+        TraderStatusVo traderStatusVo = new TraderStatusVo();
+        Integer isTraer = memberEntity.getIsTrader();
+        traderStatusVo.setIsTrader(isTraer);
+        
+        Map<String, Object> columnMap = new HashMap<>();
+        columnMap.put("member_id", memberId);
+		List<FollowTraderInfoEntity> selectByMap = followTraderInfoDao.selectByMap(columnMap);
+		if(CollUtil.isNotEmpty(selectByMap)) {
+			for(FollowTraderInfoEntity followTraderInfoEntity : selectByMap) {
+				Integer verifyStatus = followTraderInfoEntity.getVerifyStatus();
+				traderStatusVo.setVerifyStatus(verifyStatus);
+			}
+		}else{
+			traderStatusVo.setVerifyStatus(4);
+		}
+		return Result.ok(traderStatusVo);
+	}
+
+	@Override
+	public Result getTradeSetInfo() {
+		//获取用户ID
+        Long memberId = LoginUserUtils.getAppLoginUser().getId();
+        FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectTraderInfoByMemberId(memberId);
+        
+        TradeSetInfoVo tradeSetInfoVo = new TradeSetInfoVo();
+        String avatar = followTraderInfoEntity.getAvatar();
+        tradeSetInfoVo.setAvatar(avatar);
+        String nickname = followTraderInfoEntity.getNickname();
+        tradeSetInfoVo.setNickname(nickname);
+        String declaration = followTraderInfoEntity.getDeclaration();
+        tradeSetInfoVo.setDeclaration(declaration);
+        Integer isOpen = followTraderInfoEntity.getIsOpen();
+        tradeSetInfoVo.setIsOpen(isOpen);
+		return Result.ok(tradeSetInfoVo);
+	}
+
+	@Override
+	public Result updateTradeSetInfo(@Valid UpdateTradeSetInfoDto updateTradeSetInfoDto) {
+		//获取用户ID
+        Long memberId = LoginUserUtils.getAppLoginUser().getId();
+        FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectTraderInfoByMemberId(memberId);
+        String avatar = updateTradeSetInfoDto.getAvatar();
+        String nickname = updateTradeSetInfoDto.getNickname();
+        String declaration = updateTradeSetInfoDto.getDeclaration();
+        int isOpen = updateTradeSetInfoDto.getIsOpen();
+        followTraderInfoEntity.setAvatar(avatar);
+        followTraderInfoEntity.setNickname(nickname);
+        followTraderInfoEntity.setDeclaration(declaration);
+        followTraderInfoEntity.setIsOpen(isOpen);
+        followTraderInfoDao.updateById(followTraderInfoEntity);
+		return Result.ok(MessageSourceUtils.getString("member_service_0024"));
+	}
+
+	@Override
+	public Result getTradeProfitInfo() {
+		//获取用户ID
+        Long memberId = LoginUserUtils.getAppLoginUser().getId();
+        TradeProfitInfoVo tradeProfitInfoVo = new TradeProfitInfoVo();
+        //获取【交易员信息表】数据
+        FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectTraderInfoByMemberId(memberId);
+        if(ObjectUtil.isNotEmpty(followTraderInfoEntity)) {
+        	String avatar = followTraderInfoEntity.getAvatar();
+        	tradeProfitInfoVo.setAvatar(avatar);
+        	String nickname = followTraderInfoEntity.getNickname();
+        	tradeProfitInfoVo.setNickname(nickname);
+        	String declaration = followTraderInfoEntity.getDeclaration();
+        	tradeProfitInfoVo.setDeclaration(declaration);
+        }
+        //获取【交易员收益信息】数据
+        FollowTraderProfitInfoVo followTraderProfitInfoVo = followTraderProfitInfoDao.selectOneByMemberId(memberId);
+        if(ObjectUtil.isNotEmpty(followTraderProfitInfoVo)) {
+        	BigDecimal totalProfitRatio = followTraderProfitInfoVo.getTotalProfitRatio();
+        	tradeProfitInfoVo.setTotalProfitRatio(totalProfitRatio);
+        	BigDecimal totalProfit = followTraderProfitInfoVo.getTotalProfit();
+        	tradeProfitInfoVo.setTotalProfit(totalProfit);
+        	BigDecimal followerTotalProfit = followTraderProfitInfoVo.getFollowerTotalProfit();
+        	tradeProfitInfoVo.setFollowerTotalProfit(followerTotalProfit);
+        	BigDecimal winRate = followTraderProfitInfoVo.getWinRate();
+        	tradeProfitInfoVo.setWinRate(winRate);
+        	BigDecimal totalFollowerCnt = followTraderProfitInfoVo.getTotalFollowerCnt();
+        	tradeProfitInfoVo.setTotalFollowerCnt(totalFollowerCnt);
+        	BigDecimal totalOrderCnt = followTraderProfitInfoVo.getTotalOrderCnt();
+        	tradeProfitInfoVo.setTotalOrderCnt(totalOrderCnt);
+        }
+		return Result.ok(tradeProfitInfoVo);
+	}
+
+	@Override
+	public Result getTradeOrderInfo(@Valid TradeOrderInfoDto tradeOrderInfoDto) {
+		//获取用户ID
+        Long memberId = LoginUserUtils.getAppLoginUser().getId();
+		MemberEntity member = memberDao.selectById(memberId);
+		
+		List<TradeOrderInfoVo> myFollowOrderVos = new ArrayList<>();
+			//当前跟单	
+			Page<ContractHoldOrderEntity> page = new Page<>(tradeOrderInfoDto.getPageNum(), tradeOrderInfoDto.getPageSize());
+			IPage<ContractHoldOrderEntity> contractHoldOrderEntitys = followFollowerProfitDao.getMyFollowOrderNowRecords(page, memberId);
+			
+			List<ContractHoldOrderEntity> records = contractHoldOrderEntitys.getRecords();
+			if(CollUtil.isNotEmpty(records)) {
+				for(ContractHoldOrderEntity contractHoldOrderEntity : records) {
+					TradeOrderInfoVo myFollowOrderVo = new TradeOrderInfoVo();
+					//获取交易员信息
+					Long orderId = contractHoldOrderEntity.getId();
+					myFollowOrderVo.setOrderId(orderId);
+					FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectTraderInfoByMemberId(memberId);
+					String nickname = followTraderInfoEntity.getNickname();
+					myFollowOrderVo.setNickname(nickname);
+					
+					String symbol = contractHoldOrderEntity.getSymbol();
+					myFollowOrderVo.setSymbol(symbol);
+					int orderType = contractHoldOrderEntity.getOpeningType();
+					myFollowOrderVo.setOrderType(orderType);
+					int leverRatio = contractHoldOrderEntity.getLeverRatio();
+					myFollowOrderVo.setLeverRatio(leverRatio);
+					int symbolCnt = contractHoldOrderEntity.getSymbolCnt();
+					myFollowOrderVo.setSymbolCnt(symbolCnt);
+					BigDecimal bondAmount = contractHoldOrderEntity.getBondAmount().setScale(2, BigDecimal.ROUND_DOWN);
+					myFollowOrderVo.setBondAmount(bondAmount);
+					BigDecimal openingPrice = contractHoldOrderEntity.getOpeningPrice().setScale(2, BigDecimal.ROUND_DOWN);
+					myFollowOrderVo.setOpeningPrice(openingPrice);
+					String orderNo = contractHoldOrderEntity.getOrderNo();
+					myFollowOrderVo.setOrderNo(orderNo);
+					Date openingTime = contractHoldOrderEntity.getCreateTime();
+					myFollowOrderVo.setOpeningTime(openingTime);
+					
+					// 获取最新价
+					BigDecimal newPrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(contractHoldOrderEntity.getSymbol())));
+					myFollowOrderVo.setNewPrice(newPrice);
+					
+					BigDecimal lotNumber = cacheSettingUtils.getSymbolSku(contractHoldOrderEntity.getSymbol());
+					// 盈亏
+					BigDecimal rewardRatio = BigDecimal.ZERO;
+					// 开多
+					if (contractHoldOrderEntity.OPENING_TYPE_MORE == contractHoldOrderEntity.getOpeningType()) {
+						// (最新价-开仓价)*规格*张数
+						rewardRatio = newPrice.subtract(contractHoldOrderEntity.getOpeningPrice()).multiply(lotNumber).multiply(new BigDecimal(contractHoldOrderEntity.getSymbolCnt()));
+						// 开空
+					} else {
+						// (开仓价-最新价)*规格*张数
+						rewardRatio = contractHoldOrderEntity.getOpeningPrice().subtract(newPrice).multiply(lotNumber).multiply(new BigDecimal(contractHoldOrderEntity.getSymbolCnt()));
+					}
+					
+					if (member.getIsProfit() == MemberEntity.IS_PROFIT_Y) {
+						PlatformTradeSettingEntity tradeSettingEntity = cacheSettingUtils.getTradeSetting();
+						if (rewardRatio.compareTo(BigDecimal.ZERO) > -1) {
+							rewardRatio = rewardRatio.multiply(BigDecimal.ONE.subtract(tradeSettingEntity.getProfitParam()));
+						}
+					}
+					myFollowOrderVo.setRewardAmount(rewardRatio.setScale(2, BigDecimal.ROUND_DOWN));
+					
+					// 回报率
+					BigDecimal returnRate = rewardRatio.divide(contractHoldOrderEntity.getBondAmount().subtract(contractHoldOrderEntity.getOpeningFeeAmount()), 8, BigDecimal.ROUND_DOWN);
+					myFollowOrderVo.setRewardRatio(returnRate.setScale(2, BigDecimal.ROUND_DOWN));
+					
+					myFollowOrderVos.add(myFollowOrderVo);
+				}
+			}
+		
+		return Result.ok(myFollowOrderVos);
+	}
+
+	@Override
+	public Result getTradeHistoryOrderInfo(@Valid TradeOrderInfoDto tradeOrderInfoDto) {
+		//获取用户ID
+        Long memberId = LoginUserUtils.getAppLoginUser().getId();
+        List<TradeHistoryOrderInfoVo> myFollowOrderVos = new ArrayList<>();
+        //历史跟单
+        	Page<ContractOrderEntity> page = new Page<>(tradeOrderInfoDto.getPageNum(), tradeOrderInfoDto.getPageSize());
+        	IPage<ContractOrderEntity> contractOrderEntitys = followFollowerProfitDao.getMyFollowOrderHistoryRecords(page, memberId);
+        	
+        	List<ContractOrderEntity> records = contractOrderEntitys.getRecords();
+        	if(CollUtil.isNotEmpty(records)) {
+        		for(ContractOrderEntity contractOrderEntity : records) {
+        			TradeHistoryOrderInfoVo myFollowOrderVo = new TradeHistoryOrderInfoVo();
+        			//获取交易员信息
+        			FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectTraderInfoByMemberId(memberId);
+					String nickname = followTraderInfoEntity.getNickname();
+					myFollowOrderVo.setNickname(nickname);
+					Long orderId = contractOrderEntity.getId();
+					myFollowOrderVo.setOrderId(orderId);
+        			String symbol = contractOrderEntity.getSymbol();
+        			myFollowOrderVo.setSymbol(symbol);
+        			int orderType = contractOrderEntity.getOrderType();
+        			myFollowOrderVo.setOrderType(orderType);
+        			int leverRatio = contractOrderEntity.getLeverRatio();
+        			myFollowOrderVo.setLeverRatio(leverRatio);
+        			BigDecimal rewardAmount = contractOrderEntity.getRewardAmount().setScale(2, BigDecimal.ROUND_DOWN);
+        			myFollowOrderVo.setRewardAmount(rewardAmount);
+        			BigDecimal rewardRatio = contractOrderEntity.getRewardRatio().setScale(2, BigDecimal.ROUND_DOWN);
+        			myFollowOrderVo.setRewardRatio(rewardRatio);
+        			int symbolCnt = contractOrderEntity.getSymbolCnt();
+        			myFollowOrderVo.setSymbolCnt(symbolCnt);
+        			BigDecimal bondAmount = contractOrderEntity.getBondAmount().setScale(2, BigDecimal.ROUND_DOWN);
+        			myFollowOrderVo.setBondAmount(bondAmount);
+        			BigDecimal openingPrice = contractOrderEntity.getOpeningPrice().setScale(2, BigDecimal.ROUND_DOWN);
+        			myFollowOrderVo.setOpeningPrice(openingPrice);
+        			BigDecimal closingPrice = contractOrderEntity.getClosingPrice().setScale(2, BigDecimal.ROUND_DOWN);
+        			myFollowOrderVo.setClosingPrice(closingPrice);
+        			Date openingTime = contractOrderEntity.getOpeningTime();
+        			myFollowOrderVo.setOpeningTime(openingTime);
+        			Date closingTime = contractOrderEntity.getClosingTime();
+        			myFollowOrderVo.setClosingTime(closingTime);
+        			String orderNo = contractOrderEntity.getOrderNo();
+        			myFollowOrderVo.setOrderNo(orderNo);
+        			myFollowOrderVos.add(myFollowOrderVo);
+        		}
+        	}
+		return Result.ok(myFollowOrderVos);
+	}
 	
 	
 	

--
Gitblit v1.9.1