20210304 跟单只允许跟一个交易员

xiaoyong931011

2021-03-05 41a5e33865a5fa32249d74b443d3f05b571111b6

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

@@ -1,6 +1,8 @@
package com.xcong.excoin.modules.contract.service.impl;

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;

import com.alibaba.druid.sql.visitor.functions.If;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -37,11 +39,13 @@
import com.xcong.excoin.modules.member.entity.*;
import com.xcong.excoin.modules.platform.dao.TradeSettingDao;
import com.xcong.excoin.modules.platform.entity.PlatformTradeSettingEntity;
import com.xcong.excoin.rabbit.producer.FollowProducer;
import com.xcong.excoin.rabbit.producer.OrderProducer;
import com.xcong.excoin.utils.*;
import com.xcong.excoin.rabbit.pricequeue.OrderModel;
import jnr.a64asm.Mem;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import sun.rmi.runtime.Log;
@@ -100,6 +104,9 @@
    private FollowTraderInfoDao followTraderInfoDao;
    @Resource
    private FollowFollowerOrderRelationDao followFollowerOrderRelationDao;

    @Autowired
    private FollowProducer followProducer;

    @Transactional(rollbackFor = Exception.class)
    @Override
@@ -380,7 +387,8 @@
                relationEntity.setTradeOrderNo(holdOrderEntity.getOrderNo());
                followFollowerOrderRelationDao.insert(relationEntity);

                ThreadPoolUtils.sendFollowOrderTask(holdOrderEntity.getId());
                followProducer.sendAddFollowOrder(holdOrderEntity.getId());
//                ThreadPoolUtils.sendFollowOrderTask(holdOrderEntity.getId());
            }
            // 提交成功
            return Result.ok(MessageSourceUtils.getString("member_service_0024"));
@@ -1022,8 +1030,27 @@
        List<ContractHoldOrderEntity> list = contractHoldOrderDao.selectHoldOrderListByMemberId(member.getId());
        List<ContractEntrustOrderEntity> entrustList = contractEntrustOrderDao.selectEntrustOrderListByMemberId(member.getId());

        if (CollUtil.isNotEmpty(list) || CollUtil.isNotEmpty(entrustList)) {
            return Result.fail("存在持仓/委托, 无法更改");
//        if (CollUtil.isNotEmpty(list) || CollUtil.isNotEmpty(entrustList)) {
//            return Result.fail("存在持仓/委托, 无法更改");
//        }
        
        if(CollUtil.isNotEmpty(list)) {
           for(ContractHoldOrderEntity contractHoldOrderEntity : list) {
              String symbol = contractHoldOrderEntity.getSymbol();
              if(StrUtil.isEmpty(symbol)) {
                 return Result.fail("存在持仓/委托, 无法更改");
              }
              return Result.fail("币种"+symbol+"存在持仓/委托, 无法更改");
           }
        }
        if(CollUtil.isNotEmpty(entrustList)) {
           for(ContractEntrustOrderEntity contractEntrustOrderEntity : entrustList) {
              String symbol = contractEntrustOrderEntity.getSymbol();
              if(StrUtil.isEmpty(symbol)) {
                 return Result.fail("存在持仓/委托, 无法更改");
              }
              return Result.fail("币种"+symbol+"存在持仓/委托, 无法更改");
           }
        }
        
        /**