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

---
 src/main/java/com/xcong/excoin/modules/documentary/service/impl/FollowOrderOperationServiceImpl.java |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/documentary/service/impl/FollowOrderOperationServiceImpl.java b/src/main/java/com/xcong/excoin/modules/documentary/service/impl/FollowOrderOperationServiceImpl.java
index 93c91f9..8f7b81f 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/service/impl/FollowOrderOperationServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/service/impl/FollowOrderOperationServiceImpl.java
@@ -73,10 +73,12 @@
 
     @Override
     public void addFollowerOrder(Long id) {
+        log.info("进入跟单处理逻辑");
         // 查询交易员订单
         ContractHoldOrderEntity holdOrderEntity = contractHoldOrderDao.selectById(id);
 
         List<FollowFollowerSettingEntity> followerSettings = followFollowerSettingDao.selectAllFollowerSettingByTradeMemberId(holdOrderEntity.getMemberId());
+        log.info("---->{}, {}", followerSettings.size(), holdOrderEntity.getMemberId());
         // 开仓价
         BigDecimal openPrice = holdOrderEntity.getOpeningPrice();
         PlatformTradeSettingEntity tradeSettingEntity = cacheSettingUtils.getTradeSetting();
@@ -100,13 +102,15 @@
                     symbolCnt = followerSetting.getFollowCnt() * holdOrderEntity.getSymbolCnt();
                 }
 
-                // 若张数+当前持仓张数大于最大持仓张数,则取最大持仓减去当前持仓,若差值小于等于0,则不下单
-                if (symbolCnt + holdingCnt> followerSetting.getMaxFollowCnt()) {
-                    symbolCnt = followerSetting.getMaxFollowCnt() - holdingCnt;
-                }
+                if (followerSetting.getMaxFollowCnt() != null && followerSetting.getMaxFollowCnt() !=0) {
+                    // 若张数+当前持仓张数大于最大持仓张数,则取最大持仓减去当前持仓,若差值小于等于0,则不下单
+                    if (symbolCnt + holdingCnt > followerSetting.getMaxFollowCnt()) {
+                        symbolCnt = followerSetting.getMaxFollowCnt() - holdingCnt;
+                    }
 
-                if (symbolCnt <= 0) {
-                    continue;
+                    if (symbolCnt <= 0) {
+                        continue;
+                    }
                 }
 
                 MemberWalletContractEntity walletContract = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(followerSetting.getMemberId(), CoinTypeEnum.USDT.name());

--
Gitblit v1.9.1