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

---
 src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 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 24a6252..54e7f3c 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
@@ -469,6 +469,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);
@@ -485,6 +486,17 @@
 				followFollowerProfitDao.insert(followFollowerProfitEntity);
 			}
 		} else {
+			//更新【跟随者收益】数据
+			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);
+			}
+			
 			isExistSetting.setSymbols(documentaryOrderSetDto.getSymbols());
 			isExistSetting.setFollowType(documentaryOrderSetDto.getFollowType());
 			isExistSetting.setFollowCnt(documentaryOrderSetDto.getFollowCnt());
@@ -875,9 +887,9 @@
 					String phone = memberEntity.getPhone();
 					String email = memberEntity.getEmail();
 					if(StrUtil.isNotEmpty(phone)) {
-						myFollowTraderInfoVo.setAccount(phone);
+						myFollowTraderInfoVo.setNickname(phone);
 					}else {
-						myFollowTraderInfoVo.setAccount(email);
+						myFollowTraderInfoVo.setNickname(email);
 					}
 				}
 				

--
Gitblit v1.9.1