From 1235945d67d8d0186b80b1b9351682a1df3eba53 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 03 Aug 2020 11:03:32 +0800
Subject: [PATCH] modify updateDocumentaryOrderSetInfo interface

---
 src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java |    1 +
 src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java    |   23 ++++++++++++++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
index 484789e..95137e1 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
@@ -199,6 +199,7 @@
                 LogRecordUtils.insertMemberAccountFlow(memberEntity.getId(), prePaymentAmount, walletContract.getAvailableBalance().subtract(prePaymentAmount), submitOrderDto.getSymbol(), "买跌持仓", "买跌:" + submitOrderDto.getSymbol());
             }
 
+            // 若该用户为交易员且开启带单模式,则发送带单异步
             if (isOpenFollow) {
                 ThreadPoolUtils.sendFollowOrderTask(holdOrderEntity.getId());
             }
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 8fdc2c2..563335d 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
@@ -530,11 +530,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.setTradeId(traderId);
+			followFollowerSettingEntity.setMemberId(memberId);
+			followFollowerSettingEntity.setTradeMemberId(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"));
 	}

--
Gitblit v1.9.1