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/ContractHoldOrderServiceImpl.java

@@ -385,17 +385,7 @@

            // 若该用户为交易员且开启带单模式，则发送带单异步
            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.setTradeOrderNo(holdOrderEntity.getOrderNo());
                followFollowerOrderRelationDao.insert(relationEntity);

                followProducer.sendAddFollowOrder(holdOrderEntity.getId());
                sendFollowOrder(tradeInfo, holdOrderEntity);
//                ThreadPoolUtils.sendFollowOrderTask(holdOrderEntity.getId());
            }
            // 提交成功
@@ -405,6 +395,20 @@
        return Result.fail(MessageSourceUtils.getString("member_service_0067"));
    }

    @Override
    public void sendFollowOrder(FollowTraderInfoEntity tradeInfo, ContractHoldOrderEntity holdOrderEntity) {
        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.setTradeOrderNo(holdOrderEntity.getOrderNo());
        followFollowerOrderRelationDao.insert(relationEntity);

        followProducer.sendAddFollowOrder(holdOrderEntity.getId());
    }

    /**
     * 全仓模式--若当前已经存在持仓，则合并当前持仓
@@ -527,7 +531,7 @@
                holdOrderListVo.setReturnRate(returnRate);
                holdOrderListVo.setProfitOrLoss(rewardRatio);
                if (ContractEntrustOrderEntity.POSITION_TYPE_ALL == memberEntity.getContractPositionType()) {
                    BigDecimal forcePrice = CalculateUtil.getForceSetPriceForWhole(holdOrderEntity.getSymbol(), memberEntity);
                    BigDecimal forcePrice = CalculateUtil.calForcePriceForWhole(memberEntity, holdOrderEntity);
                    holdOrderListVo.setForceClosingPrice(forcePrice);
                }
                resultList.add(holdOrderListVo);
@@ -648,7 +652,7 @@
           return Result.loading("loading_type");
        }
        
        List<ContractHoldOrderEntity> holdOrderEntities = contractHoldOrderDao.selectHoldOrderListByMemberIdAndSymbol(memberEntity.getId(), symbolDto.getSymbol(), 1);
        List<ContractHoldOrderEntity> holdOrderEntities = contractHoldOrderDao.selectHoldOrderListByMemberIdAndSymbol(memberEntity.getId(), symbolDto.getSymbol(), symbolDto.getType());
        if (CollUtil.isEmpty(holdOrderEntities)) {
            return Result.fail("订单不存在");
        }
@@ -859,7 +863,7 @@
        BigDecimal newPriceSymbol = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(symbol)));

        List<ContractEntrustOrderEntity> entrustOrderEntities = contractEntrustOrderDao.selectEntrustOrderListByMemberId(memberEntity.getId());
        List<ContractHoldOrderEntity> holdOrderEntities = contractHoldOrderDao.selectHoldOrderListByMemberIdAndSymbolTest(memberEntity.getId(), ContractOrderEntity.CONTRACTTYPE_NORMAL);
        List<ContractHoldOrderEntity> holdOrderEntities = contractHoldOrderDao.selectHoldOrderListByMemberIdAndSymbolTest(memberEntity.getId(), null);
        MemberWalletContractEntity walletContractEntity = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberEntity.getId(), CoinTypeEnum.USDT.name());
//        if (memberEntity.getContractPositionType().equals(ContractEntrustOrderEntity.POSITION_TYPE_ADD)) {
//            // 当前合约委托单