Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity

Helius

2021-03-30 2cdf732d4130b227514d2c0ba1e40e6c1cece54a

 src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java

@@ -179,6 +179,21 @@
        }
    }

    private void closingFollowerOrders(MemberEntity memberEntity, ContractHoldOrderEntity holdOrderEntity) {
        // 判断当前持仓是否为跟单订单
//        if (ContractOrderEntity.CONTRACTTYPE_DOCUMENTARY == holdOrderEntity.getContractType()) {
//            updateFollowOrderRelation(holdOrderEntity.getId(), contractOrderEntity.getId());
//
//            // 若为交易员，则平仓跟随者订单
//            if (MemberEntity.IS_TRADER_Y.equals(memberEntity.getIsTrader())) {
//                followOrderOperationService.closingFollowOrders(holdOrderEntity.getOrderNo());
//            } else {
//                //followFollowerProfitDao.updateFollowerProfitByTradeMemberId(holdOrderEntity.getBondAmount(), profitOrLoss, traderInfoEntity.getMemberId(), memberEntity.getId());
//                LogRecordUtils.insertFollowerNotice(memberEntity.getId(), NoticeConstant.CLOSE_ORDER_TITLE, StrUtil.format(NoticeConstant.CLOSE_ORDER_CONTENT, contractOrderEntity.getSymbol(), contractOrderEntity.getClosingPrice().setScale(2, BigDecimal.ROUND_HALF_UP).toString(), profitOrLoss.setScale(2, BigDecimal.ROUND_HALF_UP).toString(), traderInfoEntity.getNickname()));
//            }
//        }
    }


    /**
     * 开多止盈
@@ -937,10 +952,10 @@
                    QueryWrapper<FollowFollowerSettingEntity> queryWrapper = new QueryWrapper<>();
                    queryWrapper.eq("member_id",coinsOrder.getMemberId());
                    FollowFollowerSettingEntity followFollowerSettingEntity = followFollowerSettingDao.selectOne(queryWrapper);
                    if(ObjectUtil.isNotEmpty(followFollowerSettingEntity)){
                        Long traderMemberId = followFollowerSettingEntity.getTraderMemberId();
                        followFollowerProfitDao.updateFollowerProfitByTradeMemberId(coinsOrder.getBondAmount().negate(), coinsOrder.getBondAmount().negate(), traderMemberId, memberEntity.getId());
                    }
//                    if(ObjectUtil.isNotEmpty(followFollowerSettingEntity)){
//                        Long traderMemberId = followFollowerSettingEntity.getTraderMemberId();
//                        followFollowerProfitDao.updateFollowerProfitByTradeMemberId(coinsOrder.getBondAmount().negate(), coinsOrder.getBondAmount().negate(), traderMemberId, memberEntity.getId());
//                    }
                    FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectById(followFollowerSettingEntity.getTraderId());
                    //更新跟随者-订单关联表
                    updateFollowOrderRelation(coinsOrder.getId(), contractOrderEntity.getId());