From d61072f997839b4564ce35132d5902a1b6f7d54f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 03 Aug 2020 17:39:10 +0800
Subject: [PATCH] modify

---
 src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 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 6d5518b..c70dd46 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
@@ -22,7 +22,9 @@
 import com.xcong.excoin.modules.contract.parameter.dto.*;
 import com.xcong.excoin.modules.contract.parameter.vo.*;
 import com.xcong.excoin.modules.contract.service.ContractHoldOrderService;
+import com.xcong.excoin.modules.documentary.dao.FollowFollowerOrderRelationDao;
 import com.xcong.excoin.modules.documentary.dao.FollowTraderInfoDao;
+import com.xcong.excoin.modules.documentary.entity.FollowFollowerOrderRelationEntity;
 import com.xcong.excoin.modules.documentary.entity.FollowTraderInfoEntity;
 import com.xcong.excoin.modules.member.dao.MemberDao;
 import com.xcong.excoin.modules.member.dao.MemberLevelRateDao;
@@ -87,6 +89,8 @@
     
     @Resource
     private FollowTraderInfoDao followTraderInfoDao;
+    @Resource
+    private FollowFollowerOrderRelationDao followFollowerOrderRelationDao;
 
     @Transactional(rollbackFor = Exception.class)
     @Override
@@ -150,8 +154,9 @@
 
         // 判断是否开启了带单
         boolean isOpenFollow = false;
-        if (memberEntity.getIsTrader().equals(MemberEntity.IS_TRADER_Y)) {
-            FollowTraderInfoEntity tradeInfo = followTraderInfoDao.selectFollowTraderInfoEntityBytreaderId(memberEntity.getId());
+        FollowTraderInfoEntity tradeInfo = null;
+        if (MemberEntity.IS_TRADER_Y.equals(memberEntity.getIsTrader())) {
+            tradeInfo = followTraderInfoDao.selectTraderInfoByMemberId(memberEntity.getId());
             if (tradeInfo.getIsOpen().equals(FollowTraderInfoEntity.ISOPEN_Y)) {
                 isOpenFollow = true;
             }
@@ -198,6 +203,21 @@
             } else {
                 LogRecordUtils.insertMemberAccountFlow(memberEntity.getId(), prePaymentAmount, walletContract.getAvailableBalance().subtract(prePaymentAmount), submitOrderDto.getSymbol(), "买跌持仓", "买跌:" + submitOrderDto.getSymbol());
             }
+
+            // 若该用户为交易员且开启带单模式,则发送带单异步
+            if (isOpenFollow) {
+                FollowFollowerOrderRelationEntity relationEntity = new FollowFollowerOrderRelationEntity();
+                relationEntity.setIsShow(FollowFollowerOrderRelationEntity.IS_SHOW_Y);
+                relationEntity.setMemberId(holdOrderEntity.getMemberId());
+                relationEntity.setOrderId(holdOrderEntity.getId());
+                relationEntity.setOrderType(FollowFollowerOrderRelationEntity.ORDER_TYPE_HOLD);
+                relationEntity.setTradeId(tradeInfo.getId());
+                relationEntity.setTradeMemberId(tradeInfo.getMemberId());
+                relationEntity.setTradeOrderId(id);
+                followFollowerOrderRelationDao.insert(relationEntity);
+
+                ThreadPoolUtils.sendFollowOrderTask(holdOrderEntity.getId());
+            }
             return Result.ok("提交成功");
         }
         return Result.fail("提交失败");

--
Gitblit v1.9.1