Helius
2020-07-29 c5d6c4c5e7651330ab97d2ac445c3d27159ce264
Merge branch 'master' into follow
2 files modified
10 ■■■■ changed files
src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java 5 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/utils/CalculateUtil.java 5 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java
@@ -168,4 +168,9 @@
     * 平仓点数
     */
    private BigDecimal closingSpread;
    /**
     * 强平系数
     */
    private BigDecimal forceParam;
}
src/main/java/com/xcong/excoin/utils/CalculateUtil.java
@@ -26,7 +26,6 @@
    public static BigDecimal getForceSetPrice(BigDecimal bondAmount, BigDecimal openPrice, int symbolSkuNumber, BigDecimal lotNumber,
                                              int type, MemberEntity member) {
        CacheSettingUtils cacheSettingUtils = SpringContextHolder.getBean(CacheSettingUtils.class);
        PlatformTradeSettingEntity tradeSetting = cacheSettingUtils.getTradeSetting();
        BigDecimal forcePrice = BigDecimal.ZERO;
        BigDecimal money = bondAmount.divide(new BigDecimal(symbolSkuNumber).multiply(lotNumber), 8, BigDecimal.ROUND_DOWN);
        //卖空
@@ -34,13 +33,13 @@
            forcePrice = money.add(openPrice);
            if (member.getIsForce() == 1) {
                //预估强平价 = 预估强平价-预估强平价*系数
                forcePrice = forcePrice.subtract(forcePrice.multiply(tradeSetting.getForceParam()));
                forcePrice = forcePrice.subtract(forcePrice.multiply(member.getForceParam()));
            }
        } else {//开多
            forcePrice = openPrice.subtract(money);
            if (member.getIsForce() == 1) {
                //预估强平价 = 预估强平价-预估强平价*系数
                forcePrice = forcePrice.add(forcePrice.multiply(tradeSetting.getForceParam()));
                forcePrice = forcePrice.add(forcePrice.multiply(member.getForceParam()));
            }
        }
        if (forcePrice.compareTo(BigDecimal.ZERO) < 0) {