modify

Helius

2020-08-03 29025eba1131c4dcd2777062a39faab868c6ce41

 src/main/java/com/xcong/excoin/modules/documentary/service/impl/FollowOrderOperationServiceImpl.java

@@ -93,6 +93,7 @@
        Long tradeMemberId = holdOrderEntity.getMemberId();
        if (CollUtil.isNotEmpty(followerSettings)) {
            for (FollowFollowerSettingEntity followerSetting : followerSettings) {
                log.info("循环开始");
                // 当前持仓张数
                Integer holdingCnt = followFollowerOrderRelationDao.selectFollowerHoldingSymbolCnt(tradeMemberId, followerSetting.getMemberId());

@@ -104,13 +105,16 @@
                    symbolCnt = followerSetting.getFollowCnt() * holdOrderEntity.getSymbolCnt();
                }

                log.info("--->>>{}, {}", symbolCnt, followerSetting.getMaxFollowCnt());
                if (followerSetting.getMaxFollowCnt() != null && followerSetting.getMaxFollowCnt() !=0) {
                    // 若张数+当前持仓张数大于最大持仓张数，则取最大持仓减去当前持仓，若差值小于等于0，则不下单
                    if (symbolCnt + holdingCnt > followerSetting.getMaxFollowCnt()) {
                        symbolCnt = followerSetting.getMaxFollowCnt() - holdingCnt;
                    }

                    log.info("--->{}, {}, {}", symbolCnt, followerSetting.getMaxFollowCnt(), holdingCnt);
                    if (symbolCnt <= 0) {
//                        LogRecordUtils.insertFollowerNotice(memberEntity.getId(), NoticeConstant.OPEN_ORDER_TITLE, StrUtil.format(NoticeConstant.OPEN_ORDER_CONTENT, holdOrderEntity.getSymbol() + "开空", openPrice, followTraderInfoEntity.getNickname()));
                        continue;
                    }
                }
@@ -162,7 +166,7 @@
                followHoldOrder.setBondAmount(bondAmount.add(openFeePrice));
                followHoldOrder.setOperateNo(1);
                // 设置合约类型
                holdOrderEntity.setContractType(ContractOrderEntity.CONTRACTTYPE_DOCUMENTARY);
                followHoldOrder.setContractType(ContractOrderEntity.CONTRACTTYPE_DOCUMENTARY);

                ContractOrderEntity contractOrderEntity = ContractHoldOrderEntityMapper.INSTANCE.holdOrderToOrder(followHoldOrder);
                contractOrderEntity.setOpeningTime(new Date());