merge master

Helius

2020-08-13 07772d52526d21822d2c6f102beacea9196070b6

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

@@ -28,11 +28,9 @@
import com.xcong.excoin.modules.documentary.entity.FollowTraderInfoEntity;
import com.xcong.excoin.modules.member.dao.MemberDao;
import com.xcong.excoin.modules.member.dao.MemberLevelRateDao;
import com.xcong.excoin.modules.member.dao.MemberSettingDao;
import com.xcong.excoin.modules.member.dao.MemberWalletContractDao;
import com.xcong.excoin.modules.member.entity.AgentReturnEntity;
import com.xcong.excoin.modules.member.entity.MemberEntity;
import com.xcong.excoin.modules.member.entity.MemberLevelRateEntity;
import com.xcong.excoin.modules.member.entity.MemberWalletContractEntity;
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.OrderProducer;
@@ -86,11 +84,12 @@

    @Resource
    private MemberDao memberDao;
    
    @Resource
    private FollowTraderInfoDao followTraderInfoDao;
    @Resource
    private FollowFollowerOrderRelationDao followFollowerOrderRelationDao;
    @Resource
    private MemberSettingDao memberSettingDao;

    @Transactional(rollbackFor = Exception.class)
    @Override
@@ -104,9 +103,8 @@

        PlatformTradeSettingEntity tradeSettingEntity = cacheSettingUtils.getTradeSetting();

        Long id = memberEntity.getId();
        MemberEntity selectById = memberDao.selectById(id);
        BigDecimal spread = selectById.getSpread();
        MemberSettingEntity memberSetting = memberSettingDao.selectMemberSettingByMemberId(memberEntity.getId());
        BigDecimal spread = memberSetting.getSpread();
        // 规格
        BigDecimal lotNumber = cacheSettingUtils.getSymbolSku(submitOrderDto.getSymbol());

@@ -213,7 +211,7 @@
                relationEntity.setOrderType(FollowFollowerOrderRelationEntity.ORDER_TYPE_HOLD);
                relationEntity.setTradeId(tradeInfo.getId());
                relationEntity.setTradeMemberId(tradeInfo.getMemberId());
                relationEntity.setTradeOrderId(holdOrderEntity.getId());
                relationEntity.setTradeOrderNo(holdOrderEntity.getOrderNo());
                followFollowerOrderRelationDao.insert(relationEntity);

                ThreadPoolUtils.sendFollowOrderTask(holdOrderEntity.getId());
@@ -239,10 +237,10 @@
    }

    @Override
    public Result findHoldOrderList(String symbol) {
    public Result findHoldOrderList(String symbol, int type) {
        MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();

        List<ContractHoldOrderEntity> list = contractHoldOrderDao.selectHoldOrderListByMemberIdAndSymbol(memberEntity.getId(), symbol);
        List<ContractHoldOrderEntity> list = contractHoldOrderDao.selectHoldOrderListByMemberIdAndSymbol(memberEntity.getId(), symbol, type);
        MemberWalletContractEntity walletContractEntity = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberEntity.getId(), CoinTypeEnum.USDT.name());
        if (CollUtil.isNotEmpty(list)) {
            BigDecimal totalProfitOrLoss = BigDecimal.ZERO;
@@ -332,7 +330,7 @@
    @Override
    public Result cancelHoldOrderBatch(SymbolDto symbolDto) {
        MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();
        List<ContractHoldOrderEntity> holdOrderEntities = contractHoldOrderDao.selectHoldOrderListByMemberIdAndSymbol(memberEntity.getId(), symbolDto.getSymbol());
        List<ContractHoldOrderEntity> holdOrderEntities = contractHoldOrderDao.selectHoldOrderListByMemberIdAndSymbol(memberEntity.getId(), symbolDto.getSymbol(), 1);
        if (CollUtil.isEmpty(holdOrderEntities)) {
            return Result.fail("订单不存在");
        }