From edb19b1fec14d667363b38b90dbb4585a0cc37ef Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 04 Mar 2021 11:32:42 +0800
Subject: [PATCH] 20210304   消息提醒日志

---
 src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java |  633 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 578 insertions(+), 55 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 4f4cbc2..ba8d937 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,41 +10,60 @@
 import javax.annotation.Resource;
 import javax.validation.Valid;
 
-import org.apache.http.impl.NoConnectionReuseStrategy;
+import com.xcong.excoin.modules.documentary.common.NoticeConstant;
+import com.xcong.excoin.modules.member.entity.MemberSettingEntity;
+import com.xcong.excoin.modules.member.parameter.vo.MemberMessageReminderVo;
+import com.xcong.excoin.utils.*;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.taobao.api.internal.toplink.embedded.websocket.util.StringUtil;
 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.contract.dao.ContractHoldOrderDao;
+import com.xcong.excoin.modules.contract.dao.ContractOrderDao;
+import com.xcong.excoin.modules.contract.entity.ContractEntrustOrderEntity;
 import com.xcong.excoin.modules.contract.entity.ContractHoldOrderEntity;
 import com.xcong.excoin.modules.contract.entity.ContractOrderEntity;
+import com.xcong.excoin.modules.documentary.dao.FollowFollowerNoticeDao;
 import com.xcong.excoin.modules.documentary.dao.FollowFollowerOrderRelationDao;
 import com.xcong.excoin.modules.documentary.dao.FollowFollowerProfitDao;
 import com.xcong.excoin.modules.documentary.dao.FollowFollowerSettingDao;
 import com.xcong.excoin.modules.documentary.dao.FollowTraderInfoDao;
+import com.xcong.excoin.modules.documentary.dao.FollowTraderLabelDao;
 import com.xcong.excoin.modules.documentary.dao.FollowTraderProfitDetailDao;
 import com.xcong.excoin.modules.documentary.dao.FollowTraderProfitInfoDao;
 import com.xcong.excoin.modules.documentary.dto.CancelDocumentaryOrderSetDto;
 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;
+import com.xcong.excoin.modules.documentary.dto.OutFollowInfoDto;
+import com.xcong.excoin.modules.documentary.dto.TradeFollowInfoDto;
+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.FollowFollowerNoticeEntity;
 import com.xcong.excoin.modules.documentary.entity.FollowFollowerOrderRelationEntity;
 import com.xcong.excoin.modules.documentary.entity.FollowFollowerProfitEntity;
 import com.xcong.excoin.modules.documentary.entity.FollowFollowerSettingEntity;
 import com.xcong.excoin.modules.documentary.entity.FollowTraderInfoEntity;
+import com.xcong.excoin.modules.documentary.entity.FollowTraderLabelEntity;
 import com.xcong.excoin.modules.documentary.entity.FollowTraderProfitInfoEntity;
 import com.xcong.excoin.modules.documentary.service.DocumentaryService;
+import com.xcong.excoin.modules.documentary.vo.BeTraderConditionVo;
 import com.xcong.excoin.modules.documentary.vo.DocumentaryOrderInfoVo;
 import com.xcong.excoin.modules.documentary.vo.DocumentaryOrderSetInfoVo;
+import com.xcong.excoin.modules.documentary.vo.FollowFollowerNoticeVo;
 import com.xcong.excoin.modules.documentary.vo.FollowInfoVo;
 import com.xcong.excoin.modules.documentary.vo.FollowRecordsVo;
 import com.xcong.excoin.modules.documentary.vo.FollowTraderProfitInfoVo;
@@ -52,22 +71,26 @@
 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.TradeFollowInfoVo;
+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.TradeSetLabelInfoVo;
 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.MemberSettingDao;
 import com.xcong.excoin.modules.member.dao.MemberWalletContractDao;
 import com.xcong.excoin.modules.member.entity.MemberEntity;
 import com.xcong.excoin.modules.member.entity.MemberLevelRateEntity;
 import com.xcong.excoin.modules.member.entity.MemberWalletContractEntity;
 import com.xcong.excoin.modules.platform.entity.PlatformTradeSettingEntity;
-import com.xcong.excoin.utils.CacheSettingUtils;
-import com.xcong.excoin.utils.CoinTypeConvert;
-import com.xcong.excoin.utils.MessageSourceUtils;
-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 jnr.ffi.Struct.int16_t;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
@@ -93,6 +116,8 @@
     @Resource
     private ContractHoldOrderDao contractHoldOrderDao;
     @Resource
+    private ContractOrderDao contractOrderDao;
+    @Resource
     private MemberLevelRateDao memberLevelRateDao;
     @Resource
     private MemberWalletContractDao memberWalletContractDao;
@@ -100,6 +125,12 @@
     private FollowFollowerSettingDao followFollowerSettingDao;
     @Resource
     private FollowFollowerOrderRelationDao followFollowerOrderRelationDao;
+    @Resource
+    private FollowFollowerNoticeDao followFollowerNoticeDao;
+    @Resource
+    private FollowTraderLabelDao followTraderLabelDao;
+    @Resource
+    private MemberSettingDao memberSettingDao;
     
 	
 	@Override
@@ -119,10 +150,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();
@@ -134,12 +169,10 @@
         			Long memberId = user.getId();
         			FollowFollowerProfitEntity followFollowerProfitEntity = followFollowerProfitDao.selectDocumentaryOrderSetInfoBymemberIdAndTradeId(memberId, traderId);
         			if(ObjectUtil.isNotEmpty(followFollowerProfitEntity)) {
-        				FollowTraderProfitInfoVo.setDocumentaaryType(1);
+        				FollowTraderProfitInfoVo.setDocumentaryType(followFollowerProfitEntity.getIsFollow());
         			}else {
-        				FollowTraderProfitInfoVo.setDocumentaaryType(2);
-        			}
-        		}else {
-        			FollowTraderProfitInfoVo.setDocumentaaryType(2);
+            			FollowTraderProfitInfoVo.setDocumentaryType(2);
+            		}
         		}
         		Long traderId = FollowTraderProfitInfoVo.getTraderId();
         		FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectFollowTraderInfoEntityBytreaderId(traderId);
@@ -151,9 +184,37 @@
         		FollowTraderProfitInfoVo.setDeclaration(declaration);
         		Integer isAll = followTraderInfoEntity.getIsAll();
         		FollowTraderProfitInfoVo.setIsAll(isAll);
+        		
+        		String labels = followTraderInfoEntity.getLabels();
+        		if(StrUtil.isNotEmpty(labels)) {
+        			ArrayList<FollowTraderLabelEntity> arrayList = new ArrayList<>();
+        			String[] split = labels.split(",");
+        			int length = split.length;
+        			for(int i = 0;i < length;i++) {
+        				String string = split[i];
+        				FollowTraderLabelEntity selectById = followTraderLabelDao.selectById(Long.parseLong(string));
+        				arrayList.add(selectById);
+        			}
+        			FollowTraderProfitInfoVo.setLabels(arrayList);
+        		}
+        		
         	}
         }
 		return Result.ok(followTraderProfitInfoVoList);
+	}
+	
+	public static void main(String[] args) {
+		String labels = "1,2,3";
+		if(StrUtil.isNotEmpty(labels)) {
+			String labelsName = "";
+			String[] split = labels.split(",");
+			int length = split.length;
+			for(int i = 0;i < length;i++) {
+				String string = split[i];
+				labelsName += (string + ",");
+			}
+			System.out.println(labelsName);
+		}
 	}
 
 	@Override
@@ -171,7 +232,8 @@
         		historyOrderRecordsVo.setClosingPrice(closingPrice);
         		BigDecimal openingPrice = historyOrderRecordsVo.getOpeningPrice().setScale(2, BigDecimal.ROUND_DOWN);
         		historyOrderRecordsVo.setOpeningPrice(openingPrice);
-        	}
+				historyOrderRecordsVo.setClosingTimeStamp(historyOrderRecordsVo.getClosingTime().getTime());
+			}
         }
 		return Result.ok(historyOrderRecordsVoList);
 	}
@@ -259,36 +321,40 @@
         			//获取交易员信息
 					Long orderId = contractOrderEntity.getId();
 					FollowFollowerOrderRelationEntity FollowFollowerOrderRelation = followFollowerOrderRelationDao.selectHistoryOneByorderId(orderId);
-					Long tradeId = FollowFollowerOrderRelation.getTradeId();
-					FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectById(tradeId);
-					String nickname = followTraderInfoEntity.getNickname();
-					myFollowOrderVo.setNickname(nickname);
-        			
-        			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);
+					if(ObjectUtil.isNotEmpty(FollowFollowerOrderRelation)) {
+						myFollowOrderVo.setOrderId(orderId);
+						Long tradeId = FollowFollowerOrderRelation.getTradeId();
+						FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectById(tradeId);
+						if(ObjectUtil.isNotEmpty(followTraderInfoEntity)) {
+							String nickname = followTraderInfoEntity.getNickname();
+							myFollowOrderVo.setNickname(nickname);
+						}
+						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(4, 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);
@@ -311,6 +377,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);
@@ -361,7 +428,7 @@
 					
 					// 回报率
 					BigDecimal returnRate = rewardRatio.divide(contractHoldOrderEntity.getBondAmount().subtract(contractHoldOrderEntity.getOpeningFeeAmount()), 8, BigDecimal.ROUND_DOWN);
-					myFollowOrderVo.setRewardRatio(returnRate.setScale(2, BigDecimal.ROUND_DOWN));
+					myFollowOrderVo.setRewardRatio(returnRate.setScale(4, BigDecimal.ROUND_DOWN));
 					
 					myFollowOrderVos.add(myFollowOrderVo);
 				}
@@ -394,6 +461,8 @@
 				myFollowTraderInfoVo.setTotalPrincipal(totalPrincipal);
 				BigDecimal totalProfit = FollowFollowerProfitEntity.getTotalProfit();
 	        	myFollowTraderInfoVo.setTotalProfit(totalProfit.setScale(2, BigDecimal.ROUND_DOWN));
+
+				myFollowTraderInfoVo.setTradeId(tradeId);
 	        	myFollowOrderVos.add(myFollowTraderInfoVo);
 	        }
 		}
@@ -439,7 +508,21 @@
 
 		FollowTraderInfoEntity traderInfoEntity = followTraderInfoDao.selectTraderInfoByMemberId(memberId);
 		if (traderInfoEntity != null) {
-			return Result.fail("交易员不能进行跟单");
+			return Result.fail(MessageSourceUtils.getString("documentary_service_0014"));
+		}
+		
+		//判断当前用户是否是逐仓模式
+		MemberEntity selectById2 = memberDao.selectById(memberId);
+		Integer contractPositionType = selectById2.getContractPositionType();
+		if(ContractEntrustOrderEntity.POSITION_TYPE_ADD != contractPositionType) {
+			return Result.fail(MessageSourceUtils.getString("documentary_service_0017"));
+		}
+		
+		//判断交易员是否开启了跟单
+		FollowTraderInfoEntity selectById = followTraderInfoDao.selectById(traderId);
+		Integer isOpen = selectById.getIsOpen();
+		if(FollowTraderInfoEntity.ISOPEN_Y != isOpen) {
+			return Result.fail(MessageSourceUtils.getString("documentary_service_0016"));
 		}
 
 		FollowFollowerSettingEntity isExistSetting = followFollowerSettingDao.selectOneBymemberIdAndTradeId(memberId, traderId);
@@ -459,6 +542,7 @@
 			//更新【跟随者收益】数据
 			Map<String, Object> columnMap = new HashMap<>();
 			columnMap.put("member_id", memberId);
+			columnMap.put("trade_id", traderId);
 			List<FollowFollowerProfitEntity> selectByMap = followFollowerProfitDao.selectByMap(columnMap);
 			if (CollUtil.isNotEmpty(selectByMap)) {
 				FollowFollowerProfitEntity followFollowerProfitEntity = selectByMap.get(0);
@@ -475,12 +559,33 @@
 				followFollowerProfitDao.insert(followFollowerProfitEntity);
 			}
 		} else {
-			FollowFollowerSettingEntity followFollowerSettingEntity = new FollowFollowerSettingEntity();
-			followFollowerSettingEntity.setSymbols(documentaryOrderSetDto.getSymbols());
-			followFollowerSettingEntity.setFollowType(documentaryOrderSetDto.getFollowType());
-			followFollowerSettingEntity.setFollowCnt(documentaryOrderSetDto.getFollowCnt());
-			followFollowerSettingEntity.setMaxFollowCnt(documentaryOrderSetDto.getMaxFollowCnt());
-			followFollowerSettingDao.updateById(followFollowerSettingEntity);
+			//更新【跟随者收益】数据
+			Map<String, Object> columnMap = new HashMap<>();
+			columnMap.put("member_id", memberId);
+			columnMap.put("trade_id", traderId);
+			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);
+				FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectById(traderId);
+				Long traderMemberId = followTraderInfoEntity.getMemberId();
+				followFollowerProfitEntity.setTradeMemberId(traderMemberId);
+				followFollowerProfitEntity.setTotalPrincipal(BigDecimal.ZERO);
+				followFollowerProfitEntity.setTotalProfit(BigDecimal.ZERO);
+				followFollowerProfitEntity.setIsFollow(FollowFollowerProfitEntity.IS_FOLLOW_Y);
+				followFollowerProfitDao.insert(followFollowerProfitEntity);
+			}
+			
+			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"));
 	}
@@ -535,7 +640,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
@@ -573,6 +678,15 @@
 		FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectById(traderId);
 		Long memberId = followTraderInfoEntity.getMemberId();
 		FollowTraderProfitInfoVo followTraderProfitInfoVo = followTraderProfitInfoDao.selectOneByMemberId(memberId);
+		MemberEntity user = LoginUserUtils.getUser();
+		if(ObjectUtil.isNotEmpty(user)) {
+			FollowFollowerProfitEntity followFollowerProfitEntity = followFollowerProfitDao.selectDocumentaryOrderSetInfoBymemberIdAndTradeId(user.getId(), traderId);
+			if(ObjectUtil.isNotEmpty(followFollowerProfitEntity)) {
+				followTraderProfitInfoVo.setDocumentaryType(followFollowerProfitEntity.getIsFollow());
+			}else {
+				followTraderProfitInfoVo.setDocumentaryType(2);
+    		}
+		}
 		String avatar = followTraderInfoEntity.getAvatar();
 		String nickname = followTraderInfoEntity.getNickname();
 		String declaration = followTraderInfoEntity.getDeclaration();
@@ -594,6 +708,24 @@
         if(MemberEntity.CERTIFY_STATUS_Y != certifyStatus) {
         	return Result.fail(MessageSourceUtils.getString("member_controller_0009"));
         }
+        
+        //不可以处于跟单状态
+        Map<String, Object> columnMaps = new HashMap<>();
+        columnMaps.put("member_id", memberId);
+        columnMaps.put("is_follow", 1);
+        List<FollowFollowerProfitEntity> followFollowerProfitEntitys = followFollowerProfitDao.selectByMap(columnMaps);
+        if(CollUtil.isNotEmpty(followFollowerProfitEntitys)) {
+        	return Result.fail(MessageSourceUtils.getString("documentary_service_0015"));
+        }
+        
+        //合约不能持仓
+        Map<String, Object> contractHoldColumnMap = new HashMap<>();
+        contractHoldColumnMap.put("member_id", memberId);
+        List<ContractHoldOrderEntity> contractHoldOrderEntitys = contractHoldOrderDao.selectByMap(contractHoldColumnMap);
+        if(CollUtil.isNotEmpty(contractHoldOrderEntitys)) {
+        	return Result.fail(MessageSourceUtils.getString("documentary_service_0013"));
+        }
+        
         Map<String, Object> columnMap = new HashMap<>();
         columnMap.put("member_id", memberId);
 		List<FollowTraderInfoEntity> selectByMap = followTraderInfoDao.selectByMap(columnMap);
@@ -604,13 +736,14 @@
         //新增【交易员信息表】数据
         FollowTraderInfoEntity followTraderInfoEntity = new FollowTraderInfoEntity();
         followTraderInfoEntity.setMemberId(memberId);
-        followTraderInfoEntity.setAvatar(FollowTraderInfoEntity.AVATAR_DEFAULT);
+        followTraderInfoEntity.setProfitRatio(BigDecimal.valueOf(0.1));
+//        followTraderInfoEntity.setAvatar(FollowTraderInfoEntity.AVATAR_DEFAULT);
         String phone = memberEntity.getPhone();
         String email = memberEntity.getEmail();
         if(StrUtil.isNotEmpty(phone)) {
-        	followTraderInfoEntity.setNickname(phone);
+        	followTraderInfoEntity.setNickname(phone.replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2"));
         }else {
-        	followTraderInfoEntity.setNickname(email);
+        	followTraderInfoEntity.setNickname(email.replaceAll("(\\w?)(\\w+)(\\w)(@\\w+\\.[a-z]+(\\.[a-z]+)?)","$1****$3$4"));
         }
         followTraderInfoEntity.setDeclaration(FollowTraderInfoEntity.DECLARATION_DEFAULT);
         followTraderInfoEntity.setIsAll(FollowTraderInfoEntity.IS_ALL_N);
@@ -644,6 +777,396 @@
 		}
 		return Result.ok(traderStatusVo);
 	}
+
+	@Override
+	public Result getTradeSetInfo() {
+		//获取用户ID
+        Long memberId = LoginUserUtils.getAppLoginUser().getId();
+        FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectTraderInfoByMemberId(memberId);
+        
+        TradeSetInfoVo tradeSetInfoVo = new TradeSetInfoVo();
+        Long id = followTraderInfoEntity.getId();
+        tradeSetInfoVo.setTradeId(id);
+        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);
+        
+        String labels = followTraderInfoEntity.getLabels();
+		if(StrUtil.isNotEmpty(labels)) {
+			ArrayList<FollowTraderLabelEntity> arrayList = new ArrayList<>();
+			String[] split = labels.split(",");
+			int length = split.length;
+			for(int i = 0;i < length;i++) {
+				String string = split[i];
+				FollowTraderLabelEntity selectById = followTraderLabelDao.selectById(Long.parseLong(string));
+				arrayList.add(selectById);
+			}
+			tradeSetInfoVo.setFollowTraderLabelEntitys(arrayList);
+		}
+		return Result.ok(tradeSetInfoVo);
+	}
+
+	@Override
+	public Result updateTradeSetInfo(@Valid UpdateTradeSetInfoDto updateTradeSetInfoDto) {
+		//获取用户ID
+        Long memberId = LoginUserUtils.getAppLoginUser().getId();
+        FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectTraderInfoByMemberId(memberId);
+        /**
+         * todo
+         * 当前交易员有合约多单,是否可以直接调整【是否带单】,是否需要在调整前【判断是否已经有带单的合约单】
+         */
+        String avatar = updateTradeSetInfoDto.getAvatar();
+        String nickname = updateTradeSetInfoDto.getNickname();
+        String declaration = updateTradeSetInfoDto.getDeclaration();
+        int isOpen = updateTradeSetInfoDto.getIsOpen();
+        String labels = updateTradeSetInfoDto.getLabels();
+        followTraderInfoEntity.setLabels(labels);
+        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();
+					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();
+						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(4, 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();
+        			//获取【跟随者-订单关联表】中的累计数据
+        			BigDecimal allRewardAmount = BigDecimal.ZERO;
+        			BigDecimal allRewardRatio = BigDecimal.ZERO;
+        			
+        			Long orderId = contractOrderEntity.getId();
+        			String orderNo = contractOrderEntity.getOrderNo();
+        			Map<String, Object> columnMapRelation = new HashMap<>();
+        			columnMapRelation.put("trade_order_no", orderNo);
+        			columnMapRelation.put("trade_member_id", memberId);
+        			columnMapRelation.put("order_type", 2);
+        			columnMapRelation.put("is_show", 1);
+					List<FollowFollowerOrderRelationEntity> followFollowerOrderRelations = followFollowerOrderRelationDao.selectByMap(columnMapRelation);
+        			if(CollUtil.isNotEmpty(followFollowerOrderRelations)) {
+        				int size = followFollowerOrderRelations.size() - 1;
+        				myFollowOrderVo.setFollowerNumber(size);
+        				for(FollowFollowerOrderRelationEntity followFollowerOrderRelation : followFollowerOrderRelations) {
+        					Long followerMemberId = followFollowerOrderRelation.getMemberId();
+        					if(!memberId.equals(followerMemberId)) {
+        						Long followerOrderId = followFollowerOrderRelation.getOrderId();
+        						ContractOrderEntity orderEntity = contractOrderDao.selectById(followerOrderId);
+        						BigDecimal rewardAmount = orderEntity.getRewardAmount();
+        						allRewardAmount = allRewardAmount.add(rewardAmount);
+        						BigDecimal rewardRatio = orderEntity.getRewardRatio();
+        						allRewardRatio = allRewardRatio.add(rewardRatio);
+        					}
+        				}
+        			}else {
+        				myFollowOrderVo.setFollowerNumber(0);
+        			}
+        			myFollowOrderVo.setFollowerRewardAmount(allRewardAmount);
+        			myFollowOrderVo.setFollowerRewardRatio(allRewardRatio);
+        			
+        			//获取交易员信息
+        			FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectTraderInfoByMemberId(memberId);
+					String nickname = followTraderInfoEntity.getNickname();
+					myFollowOrderVo.setNickname(nickname);
+					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(4, 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);
+        			
+        			myFollowOrderVo.setOrderNo(orderNo);
+        			myFollowOrderVos.add(myFollowOrderVo);
+        		}
+        	}
+		return Result.ok(myFollowOrderVos);
+	}
+
+	@Override
+	public Result getTradeFollowInfo(@Valid TradeFollowInfoDto tradeFollowInfoDto) {
+		//获取用户ID
+        Long memberId = LoginUserUtils.getAppLoginUser().getId();
+        List<TradeFollowInfoVo> myFollowOrderVos = new ArrayList<>();
+        
+        Page<FollowFollowerProfitEntity> page = new Page<>(tradeFollowInfoDto.getPageNum(), tradeFollowInfoDto.getPageSize());
+		IPage<FollowFollowerProfitEntity> followFollowerProfitEntitys = followFollowerProfitDao.selectTradeFollowerProfitEntitys(page, memberId);
+		List<FollowFollowerProfitEntity> records = followFollowerProfitEntitys.getRecords();
+		if(CollUtil.isNotEmpty(records)) {
+			for(FollowFollowerProfitEntity followFollowerProfitEntity : records) {
+				TradeFollowInfoVo myFollowTraderInfoVo = new TradeFollowInfoVo();
+				
+				Long followMemberId = followFollowerProfitEntity.getMemberId();
+				MemberEntity memberEntity = memberDao.selectById(followMemberId);
+				if(ObjectUtil.isNotEmpty(memberEntity)) {
+					String phone = memberEntity.getPhone();
+					String email = memberEntity.getEmail();
+					if(StrUtil.isNotEmpty(phone)) {
+						myFollowTraderInfoVo.setNickname(phone);
+					}else {
+						myFollowTraderInfoVo.setNickname(email);
+					}
+				}
+				
+				Long id = followFollowerProfitEntity.getId();
+				myFollowTraderInfoVo.setId(id);
+				BigDecimal totalPrincipal = followFollowerProfitEntity.getTotalPrincipal();
+				myFollowTraderInfoVo.setTotalPrincipal(totalPrincipal);
+				BigDecimal totalProfit = followFollowerProfitEntity.getTotalProfit();
+				myFollowTraderInfoVo.setTotalProfit(totalProfit.setScale(2, BigDecimal.ROUND_DOWN));
+				
+	        	myFollowOrderVos.add(myFollowTraderInfoVo);
+	        }
+		}
+		return Result.ok(myFollowOrderVos);
+	}
+
+	@Override
+	@Transactional
+	public Result getOutFollowInfo(@Valid OutFollowInfoDto outFollowInfoDto) {
+		//获取用户ID
+        Long memberId = LoginUserUtils.getAppLoginUser().getId();
+        long id = outFollowInfoDto.getId();
+        //获取【跟随者收益】
+        FollowFollowerProfitEntity followFollowerProfitEntity = followFollowerProfitDao.selectById(id);
+        
+        //当前有跟单合约不允许移除
+        //获取【跟随者-订单关联表】
+        Map<String, Object> selectColumnMap = new HashMap<>();
+        selectColumnMap.put("member_id", followFollowerProfitEntity.getMemberId());
+        selectColumnMap.put("trade_member_id", memberId);
+        selectColumnMap.put("order_type", FollowFollowerOrderRelationEntity.ORDER_TYPE_HOLD);
+        List<FollowFollowerOrderRelationEntity> followFollowerOrderRelationEntitys = followFollowerOrderRelationDao.selectByMap(selectColumnMap);
+        if(CollUtil.isNotEmpty(followFollowerOrderRelationEntitys)) {
+        	return Result.fail(MessageSourceUtils.getString("documentary_service_0019"));
+        }
+        
+        followFollowerProfitEntity.setIsFollow(FollowFollowerProfitEntity.IS_FOLLOW_N);
+        followFollowerProfitDao.updateById(followFollowerProfitEntity);
+
+        //删除【跟随者设置】
+        Map<String, Object> columnMap = new HashMap<>();
+        Long followMemberId = followFollowerProfitEntity.getMemberId();
+        Long tradeId = followFollowerProfitEntity.getTradeId();
+        columnMap.put("member_id", followMemberId);
+        columnMap.put("trader_id", tradeId);
+        List<FollowFollowerSettingEntity> selectByMap = followFollowerSettingDao.selectByMap(columnMap);
+        if(CollUtil.isNotEmpty(selectByMap)) {
+        	for(FollowFollowerSettingEntity followFollowerSettingEntity : selectByMap) {
+        		followFollowerSettingDao.deleteById(followFollowerSettingEntity.getId());
+        	}
+        }
+
+		FollowTraderInfoEntity traderInfoEntity = followTraderInfoDao.selectTraderInfoByMemberId(memberId);
+
+		if (traderInfoEntity != null) {
+			LogRecordUtils.insertFollowerNotice(followMemberId, NoticeConstant.STOP_FOLLOW_TITLE, StrUtil.format(NoticeConstant.STOP_FOLLOW_CONTENT, traderInfoEntity.getNickname()));
+		}
+		return Result.ok(MessageSourceUtils.getString("member_service_0026"));
+	}
+
+	@Override
+	@Transactional
+	public Result getFollowFollowerNoticeList(FollowFollowerNoticeDto followFollowerNoticeDto) {
+		//获取用户ID
+        Long memberId = LoginUserUtils.getAppLoginUser().getId();
+        List<FollowFollowerNoticeVo> arrayList = new ArrayList<>();
+        
+        Page<FollowFollowerNoticeEntity> page = new Page<>(followFollowerNoticeDto.getPageNum(), followFollowerNoticeDto.getPageSize());
+        FollowFollowerNoticeEntity followFollowerNoticeEntity = new FollowFollowerNoticeEntity();
+        followFollowerNoticeEntity.setMemberId(memberId);
+        IPage<FollowFollowerNoticeEntity> followFollowerNoticelist = followFollowerNoticeDao.selectFollowFollowerNoticePage(page, followFollowerNoticeEntity);
+        List<FollowFollowerNoticeEntity> records = followFollowerNoticelist.getRecords();
+		if(CollUtil.isNotEmpty(records)) {
+			for(FollowFollowerNoticeEntity followFollowerNotice : records) {
+				FollowFollowerNoticeVo followFollowerNoticeVo = new FollowFollowerNoticeVo();
+				String title = followFollowerNotice.getTitle();
+				followFollowerNoticeVo.setTitle(title);
+				String content = followFollowerNotice.getContent();
+				followFollowerNoticeVo.setContent(content);
+				Date createTime = followFollowerNotice.getCreateTime();
+				followFollowerNoticeVo.setCreateTime(createTime);
+				arrayList.add(followFollowerNoticeVo);
+			}
+		}
+		MemberSettingEntity memberSettingEntity = memberSettingDao.selectMemberSettingByMemberId(memberId);
+		if(ObjectUtil.isNotEmpty(memberSettingEntity)) {
+			log.info(memberId + "的消息提醒状态变更");
+			memberSettingEntity.setMessageReminder(0);
+			memberSettingDao.updateById(memberSettingEntity);
+		}
+        
+		return Result.ok(arrayList);
+	}
+
+	@Override
+	public Result getTradeSetLabelInfo() {
+		//获取用户ID
+        Long memberId = LoginUserUtils.getAppLoginUser().getId();
+        
+        Map<String, Object> columnMap = new HashMap<>();
+		List<FollowTraderLabelEntity> selectByMap = followTraderLabelDao.selectByMap(columnMap);
+		ArrayList<TradeSetLabelInfoVo> arrayList = new ArrayList<>();
+		if(CollUtil.isNotEmpty(selectByMap)) {
+			for(FollowTraderLabelEntity followTraderLabelEntity : selectByMap) {
+				TradeSetLabelInfoVo tradeSetLabelInfoVo = new TradeSetLabelInfoVo();
+				Long id = followTraderLabelEntity.getId();
+				String labels = followTraderLabelEntity.getLabels();
+				tradeSetLabelInfoVo.setId(id);
+				tradeSetLabelInfoVo.setLabels(labels);
+				arrayList.add(tradeSetLabelInfoVo);
+			}
+		}
+		return Result.ok(arrayList);
+	}
+
+	@Override
+	public Result beTraderCondition() {
+		String type = "apply_trader_rule";
+		List<BeTraderConditionVo> beTraderConditionVos = followTraderInfoDao.selectBeTraderCondition(type);
+		return Result.ok(beTraderConditionVos);
+	}
 	
 	
 	

--
Gitblit v1.9.1