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

@@ -39,6 +39,7 @@
import com.xcong.excoin.modules.member.service.MemberWalletContractService;
import com.xcong.excoin.modules.platform.entity.PlatformTradeSettingEntity;
import com.xcong.excoin.rabbit.pricequeue.OrderModel;
import com.xcong.excoin.rabbit.producer.FollowProducer;
import com.xcong.excoin.rabbit.producer.OrderProducer;
import com.xcong.excoin.utils.*;
import lombok.extern.slf4j.Slf4j;
@@ -104,6 +105,9 @@
    private RedisUtils redisUtils;
    @Resource
    private FollowOrderOperationService followOrderOperationService;

    @Resource
    private FollowProducer followProducer;

    public void dealOrderFromMq(List<OrderModel> list, Integer type) {
        if (CollectionUtils.isNotEmpty(list)) {
@@ -173,6 +177,21 @@
                contractEntrustOrderDao.deleteById(entrustOrder.getId());
            }
        }
    }

    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()));
//            }
//        }
    }


@@ -625,6 +644,16 @@
                    contractHoldOrderEntity.setOpeningType(ContractHoldOrderEntity.OPENING_TYPE_LESS);
                }

                // 判断是否开启了带单
                boolean isOpenFollow = false;
                FollowTraderInfoEntity tradeInfo = null;
                if (MemberEntity.IS_TRADER_Y.equals(memberEntity.getIsTrader())) {
                    tradeInfo = followTraderInfoDao.selectTraderInfoByMemberId(memberEntity.getId());
                    if (FollowTraderInfoEntity.ISOPEN_Y.equals(tradeInfo.getIsOpen())) {
                        isOpenFollow = true;
                    }
                }

                //持仓单赋值
                contractHoldOrderEntity.setMemberId(memId);
                contractHoldOrderEntity.setIsCanClosing(ContractHoldOrderEntity.ORDER_CAN_CLOSING_Y);
@@ -647,6 +676,7 @@
                contractHoldOrderEntity.setTradeType(ContractHoldOrderEntity.TRADE_TYPE_LIMIT);
                contractHoldOrderEntity.setOperateNo(1);
                contractHoldOrderEntity.setSymbolCntSale(contractHoldOrderEntity.getSymbolCnt());
                contractHoldOrderEntity.setContractType(isOpenFollow ? ContractOrderEntity.CONTRACTTYPE_DOCUMENTARY : ContractOrderEntity.CONTRACTTYPE_NORMAL);
                contractHoldOrderService.save(contractHoldOrderEntity);

                // 需要一个历史插入
@@ -675,6 +705,12 @@

                //返佣
                ThreadPoolUtils.calReturnMoney(memberEntity.getId(), openFeePrice, contractOrderEntity, AgentReturnEntity.ORDER_TYPE_OPEN);

                // 若该用户为交易员且开启带单模式，则发送带单异步
                if (isOpenFollow) {
                    contractHoldOrderService.sendFollowOrder(tradeInfo, contractHoldOrderEntity);
                }

            }
        }
    }