modify closing newprice

Helius

2020-07-07 d344e2b6d98c9942bdb9febf5d36886f6acadb0c

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

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

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xcong.excoin.common.LoginUserUtils;
import com.xcong.excoin.common.enumerates.MemberWalletCoinEnum;
import com.xcong.excoin.common.enumerates.RabbitPriceTypeEnum;
import com.xcong.excoin.common.response.Result;
import com.xcong.excoin.common.system.service.CommonService;
import com.xcong.excoin.modules.contract.dao.ContractEntrustOrderDao;
@@ -17,6 +19,8 @@
import com.xcong.excoin.modules.member.entity.MemberEntity;
import com.xcong.excoin.modules.member.entity.MemberWalletContractEntity;
import com.xcong.excoin.modules.platform.entity.PlatformTradeSettingEntity;
import com.xcong.excoin.rabbit.pricequeue.OrderModel;
import com.xcong.excoin.rabbit.producer.OrderProducer;
import com.xcong.excoin.utils.CacheSettingUtils;
import com.xcong.excoin.utils.CoinTypeConvert;
import com.xcong.excoin.utils.RedisUtils;
@@ -26,6 +30,7 @@

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.List;

/**
@@ -53,6 +58,9 @@

    @Resource
    private CommonService commonService;

    @Resource
    private OrderProducer producer;

    @Transactional(rollbackFor = Exception.class)
    @Override
@@ -84,7 +92,7 @@
            PlatformTradeSettingEntity tradeSettingEntity = cacheSettingUtils.getTradeSetting();

            // 保证金计算 -- 建仓价X规格X手数X（1/杠杆倍率）
            BigDecimal bondAmount = submitEntrustDto.getEntrustPrice().multiply(lotNumber).multiply((BigDecimal.ONE.divide(BigDecimal.valueOf(submitEntrustDto.getLeverRatio()), 8, BigDecimal.ROUND_DOWN)));
            BigDecimal bondAmount = submitEntrustDto.getEntrustPrice().multiply(lotNumber).multiply(new BigDecimal(submitEntrustDto.getSymbolCnt())).multiply((BigDecimal.ONE.divide(BigDecimal.valueOf(submitEntrustDto.getLeverRatio()), 8, BigDecimal.ROUND_DOWN)));

            // 开仓手续费 建仓价*规格*手数*手续费率
            BigDecimal openFeePrice = submitEntrustDto.getEntrustPrice().multiply(lotNumber)
@@ -97,7 +105,7 @@
            BigDecimal entrustTotalAmount = bondAmount.add(openFeePrice).add(openFeePrice);
            log.info("预付款:{}", entrustTotalAmount);

            if (entrustTotalAmount.add(bondAmount).compareTo(walletContract.getAvailableBalance()) > -1) {
            if (entrustTotalAmount.compareTo(walletContract.getAvailableBalance()) > -1) {
                return Result.fail("可用余额不足");
            }

@@ -113,10 +121,17 @@

            int i = contractEntrustOrderDao.insert(entrustOrderEntity);

            walletContract.setFrozenBalance(walletContract.getFrozenBalance().add(entrustTotalAmount));
            walletContract.setAvailableBalance(walletContract.getAvailableBalance().subtract(entrustTotalAmount));
            memberWalletContractDao.updateById(walletContract);
            if (1 > 0) {
            memberWalletContractDao.increaseWalletContractBalanceById(entrustTotalAmount.negate(), null, entrustOrderEntity.getBondAmount(), walletContract.getId());
            if (i > 0) {

                // 发送委托单队列消息
                if (submitEntrustDto.getEntrustType() == ContractEntrustOrderEntity.ENTRUST_TYPE_OPEN_MORE) {
                    OrderModel model = new OrderModel(entrustOrderEntity.getId(), RabbitPriceTypeEnum.ENTRUST_OPEN_MORE.getValue(), submitEntrustDto.getEntrustPrice().setScale(8, RoundingMode.HALF_UP).toPlainString(), submitEntrustDto.getSymbol());
                    producer.sendPriceOperate(JSONObject.toJSONString(model));
                } else {
                    OrderModel model = new OrderModel(entrustOrderEntity.getId(), RabbitPriceTypeEnum.ENTRUST_OPEN_LESS.getValue(), submitEntrustDto.getEntrustPrice().setScale(8, RoundingMode.HALF_UP).toPlainString(), submitEntrustDto.getSymbol());
                    producer.sendPriceOperate(JSONObject.toJSONString(model));
                }
                return Result.ok("委托成功");
            } else {
                return Result.fail("委托失败");
@@ -132,9 +147,9 @@
    }

    @Override
    public Result findEntrustOrderList() {
    public Result findEntrustOrderList(String symbol) {
        MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();
        List<ContractEntrustOrderEntity> list = contractEntrustOrderDao.selectEntrustOrderListByMemberId(memberEntity.getId());
        List<ContractEntrustOrderEntity> list = contractEntrustOrderDao.selectEntrustOrderListByMemberIdAndSymbol(memberEntity.getId(), symbol);
        List<ContractEntrustVo> resultList = ContractEntrustOrderEntityMapper.INSTANCE.entityListToVoList(list);
        return Result.ok(resultList);
    }
@@ -153,13 +168,11 @@
        MemberWalletContractEntity walletContractEntity = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberEntity.getId(), MemberWalletCoinEnum.WALLETCOINCODE.getValue());

        BigDecimal total = entrustOrderEntity.getEntrustAmount();
        walletContractEntity.setAvailableBalance(walletContractEntity.getAvailableBalance().add(total));
        walletContractEntity.setFrozenBalance(walletContractEntity.getFrozenBalance().subtract(total));
        memberWalletContractDao.updateById(walletContractEntity);
        memberWalletContractDao.increaseWalletContractBalanceById(total, null, entrustOrderEntity.getBondAmount().negate(), walletContractEntity.getId());

        ContractOrderEntity orderEntity = ContractEntrustOrderEntityMapper.INSTANCE.entrustOrderToOrder(entrustOrderEntity);
        orderEntity.setTradeType(ContractOrderEntity.TRADE_TYPE_MARK_PRICE);
        orderEntity.setOrderType(ContractOrderEntity.ORDER_TYPE_CANCEL);
        orderEntity.setOrderStatus(ContractOrderEntity.ORDER_STATUS_CANCEL);
        int i = contractOrderDao.insert(orderEntity);

        contractEntrustOrderDao.deleteById(entrustOrderEntity.getId());