20200702 代码提交

xiaoyong931011

2020-07-02 7f5953fc973d65cc5d2bd496dda344fe1c6a97c8

20200702   代码提交

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

@@ -94,7 +94,7 @@
        MemberWalletContractEntity walletContract = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberEntity.getId(), CoinTypeEnum.USDT.name());

        PlatformTradeSettingEntity tradeSettingEntity = cacheSettingUtils.getTradeSetting();

        BigDecimal spread = memberEntity.getSpread();
        // 规格
        BigDecimal lotNumber = cacheSettingUtils.getSymbolSku(submitOrderDto.getSymbol());

@@ -104,12 +104,12 @@
        // 开多
        if (submitOrderDto.getOrderType() == ContractHoldOrderEntity.OPENING_TYPE_MORE) {
            // 市场价*(1 + (点差/10000))
            openingPrice = newPrice.multiply(BigDecimal.ONE.add(tradeSettingEntity.getSpread().divide(new BigDecimal(10000)))).setScale(8, BigDecimal.ROUND_DOWN);
            openingPrice = newPrice.multiply(BigDecimal.ONE.add(spread.divide(new BigDecimal(10000)))).setScale(8, BigDecimal.ROUND_DOWN);

            // 开空
        } else if (submitOrderDto.getOrderType() == ContractHoldOrderEntity.OPENING_TYPE_LESS) {
            // 市场价*(1 - (点差/10000))
            openingPrice = newPrice.multiply(BigDecimal.ONE.subtract(tradeSettingEntity.getSpread().divide(new BigDecimal(10000)))).setScale(8, BigDecimal.ROUND_DOWN);
            openingPrice = newPrice.multiply(BigDecimal.ONE.subtract(spread.divide(new BigDecimal(10000)))).setScale(8, BigDecimal.ROUND_DOWN);
        } else {
            return Result.fail("未知类型");
        }

 src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java

@@ -3,9 +3,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.xcong.excoin.common.system.base.BaseEntity;
import lombok.Data;
import org.web3j.abi.datatypes.Int;

import java.io.Serializable;
import java.math.BigDecimal;

/**
 * 会员信息实体
@@ -18,6 +16,11 @@
public class MemberEntity extends BaseEntity {

    /**
     * 
     */
    private static final long serialVersionUID = 1L;

    /**
     * 账号状态 - 禁用
     */
    public static final Integer ACCOUNT_STATUS_DISABLED = 0;
@@ -137,4 +140,9 @@
     * 是否设置预估强平价系数 0-否1-是
     */
    private Integer isForce;
    
    /**
     * 滑点
     */
    private BigDecimal spread;
}