From 76a61449b942bc20f03c8e45daca0fb85bb1b1ac Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 03 Aug 2020 15:43:33 +0800
Subject: [PATCH] modify

---
 src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java |   13 +++++++------
 1 files changed, 7 insertions(+), 6 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..1f503fb 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
@@ -394,6 +394,8 @@
 				myFollowTraderInfoVo.setTotalPrincipal(totalPrincipal);
 				BigDecimal totalProfit = FollowFollowerProfitEntity.getTotalProfit();
 	        	myFollowTraderInfoVo.setTotalProfit(totalProfit.setScale(2, BigDecimal.ROUND_DOWN));
+
+				myFollowTraderInfoVo.setTradeId(tradeId);
 	        	myFollowOrderVos.add(myFollowTraderInfoVo);
 	        }
 		}
@@ -475,12 +477,11 @@
 				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);
+			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"));
 	}

--
Gitblit v1.9.1