Helius
2020-09-11 bd01376f2a9add2d194e8dc6487ce9c10caa022b
Merge branch 'master' into helpCenter
6 files modified
79 ■■■■ changed files
src/main/java/com/xcong/excoin/modules/contract/service/ContractHoldOrderService.java 2 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java 35 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java 2 ●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/quartz/job/LoopExecutorJob.java 4 ●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/utils/CalculateUtil.java 14 ●●●● patch | view | raw | blame | history
src/test/java/com/xcong/excoin/SymbolsTest.java 22 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/contract/service/ContractHoldOrderService.java
@@ -44,4 +44,6 @@
    public void calHoldOrderHoldFeeAmount();
    public void calHoldFeeAmountForBondAmount();
}
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
@@ -611,7 +611,7 @@
                } else {
                    BigDecimal available = walletContractEntity.getAvailableBalance();
                    BigDecimal lessAmount = thisTimeHold.subtract(available);
                    MemberEntity memberEntity = memberDao.selectById(holdOrderEntity.getId());
                    MemberEntity memberEntity = memberDao.selectById(holdOrderEntity.getMemberId());
                    memberWalletContractDao.increaseWalletContractBalanceById(available.negate(), available.negate(), null, walletContractEntity.getId());
                    BigDecimal newBondAmount = holdOrderEntity.getBondAmount().subtract(lessAmount);
@@ -642,4 +642,37 @@
        }
        producer.sendPriceOperate(JSONObject.toJSONString(model));
    }
    @Transactional(rollbackFor = Exception.class)
    @Override
    public void calHoldFeeAmountForBondAmount() {
        List<ContractHoldOrderEntity> list = contractHoldOrderDao.selectAllHoldOrder();
        PlatformTradeSettingEntity tradeSettingEntity = cacheSettingUtils.getTradeSetting();
        if (CollUtil.isNotEmpty(list)) {
            for (ContractHoldOrderEntity holdOrderEntity : list) {
                BigDecimal holdAmount = holdOrderEntity.getHoldAmount();
                if (holdAmount == null) {
                    holdAmount = BigDecimal.ZERO;
                }
                BigDecimal thisTimeHold = holdOrderEntity.getBondAmount().multiply(tradeSettingEntity.getDoingRatio());
                log.info("订单编号:{}, 持仓费:{}", holdOrderEntity.getOrderNo(), thisTimeHold);
                MemberEntity memberEntity = memberDao.selectById(holdOrderEntity.getMemberId());
                BigDecimal subBond = holdOrderEntity.getBondAmount().subtract(thisTimeHold);
                BigDecimal newForcePrice = CalculateUtil.getForceSetPrice(subBond.subtract(holdOrderEntity.getOpeningFeeAmount()), holdOrderEntity.getOpeningPrice(), holdOrderEntity.getSymbolCnt(), holdOrderEntity.getSymbolSku(), holdOrderEntity.getOpeningType(), memberEntity);
                holdAmount = holdAmount.add(thisTimeHold);
                holdOrderEntity.setBondAmount(subBond);
                holdOrderEntity.setHoldAmount(holdAmount);
                holdOrderEntity.setForceClosingPrice(newForcePrice);
                holdOrderEntity.setOperateNo(holdOrderEntity.getOperateNo() + 1);
                contractHoldOrderDao.updateById(holdOrderEntity);
                // 发送爆仓消息
                sendOrderBombMsg(holdOrderEntity.getId(), holdOrderEntity.getOpeningType(), newForcePrice, holdOrderEntity.getSymbol(), holdOrderEntity.getOperateNo());
            }
        }
    }
}
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
@@ -161,7 +161,7 @@
        MemberSettingEntity memberSettingEntity = new MemberSettingEntity();
        memberSettingEntity.setSpread(BigDecimal.ONE);
        memberSettingEntity.setClosingSpread(BigDecimal.valueOf(5));
        memberSettingEntity.setForceParam(BigDecimal.valueOf(0.0030));
        memberSettingEntity.setForceParam(BigDecimal.valueOf(0.0055));
        memberSettingEntity.setMemberId(member.getId());
        memberSettingDao.insert(memberSettingEntity);
src/main/java/com/xcong/excoin/quartz/job/LoopExecutorJob.java
@@ -46,11 +46,11 @@
    /**
     * 持仓费计算
     */
    @Scheduled(cron = "0 0 0 */1 * ?")
    @Scheduled(cron = "0 0 16/8 * * ?")
    public void updateDoingPrice() {
        log.info("#持仓费计算#");
        try {
            contractHoldOrderService.calHoldOrderHoldFeeAmount();
            contractHoldOrderService.calHoldFeeAmountForBondAmount();
        } catch (Exception e) {
            log.error("#持仓费计算错误#", e);
        }
src/main/java/com/xcong/excoin/utils/CalculateUtil.java
@@ -30,21 +30,15 @@
        MemberSettingDao memberSettingDao = SpringContextHolder.getBean(MemberSettingDao.class);
        BigDecimal forcePrice = BigDecimal.ZERO;
        BigDecimal money = bondAmount.divide(new BigDecimal(symbolSkuNumber).multiply(lotNumber), 8, BigDecimal.ROUND_DOWN);
        if (member.getIsForce() == 1) {
            MemberSettingEntity memberSetting = memberSettingDao.selectMemberSettingByMemberId(member.getId());
            money = money.multiply(memberSetting.getForceParam().multiply(BigDecimal.valueOf(100)));
        }
        //卖空
        if (type == 2) {
            forcePrice = money.add(openPrice);
            if (member.getIsForce() == 1) {
                MemberSettingEntity memberSetting = memberSettingDao.selectMemberSettingByMemberId(member.getId());
                //预估强平价 = 预估强平价-预估强平价*系数
                forcePrice = forcePrice.subtract(forcePrice.multiply(memberSetting.getForceParam() == null ? BigDecimal.ZERO : memberSetting.getForceParam()));
            }
        } else {//开多
            forcePrice = openPrice.subtract(money);
            if (member.getIsForce() == 1) {
                MemberSettingEntity memberSetting = memberSettingDao.selectMemberSettingByMemberId(member.getId());
                //预估强平价 = 预估强平价-预估强平价*系数
                forcePrice = forcePrice.add(forcePrice.multiply(memberSetting.getForceParam() == null ? BigDecimal.ZERO : memberSetting.getForceParam()));
            }
        }
        if (forcePrice.compareTo(BigDecimal.ZERO) < 0) {
            forcePrice = BigDecimal.ZERO;
src/test/java/com/xcong/excoin/SymbolsTest.java
@@ -8,6 +8,7 @@
import com.xcong.excoin.modules.contract.dao.ContractHoldOrderDao;
import com.xcong.excoin.modules.contract.dao.ContractOrderDao;
import com.xcong.excoin.modules.contract.entity.ContractHoldOrderEntity;
import com.xcong.excoin.modules.contract.service.ContractHoldOrderService;
import com.xcong.excoin.modules.member.dao.MemberDao;
import com.xcong.excoin.modules.member.dao.MemberLevelRateDao;
import com.xcong.excoin.modules.member.dao.MemberWalletContractDao;
@@ -17,6 +18,7 @@
import com.xcong.excoin.modules.symbols.service.SymbolsService;
import com.xcong.excoin.rabbit.producer.OrderProducer;
import com.xcong.excoin.utils.CacheSettingUtils;
import com.xcong.excoin.utils.CalculateUtil;
import com.xcong.excoin.utils.CoinTypeConvert;
import com.xcong.excoin.utils.RedisUtils;
import lombok.extern.slf4j.Slf4j;
@@ -117,4 +119,24 @@
        log.info("----->{}", totalProfitOrLess);
    }
    @Test
    public void forceTest() {
        ContractHoldOrderEntity hold = contractHoldOrderDao.selectById(28284L);
        MemberEntity memberEntity = memberDao.selectById(6L);
        BigDecimal forceSetPrice = CalculateUtil.getForceSetPrice(hold.getBondAmount(), hold.getOpeningPrice(), hold.getSymbolCnt(), hold.getSymbolSku(), hold.getOpeningType(), memberEntity);
        System.out.println(forceSetPrice);
    }
    @Resource
    private ContractHoldOrderService contractHoldOrderService;
    @Test
    public void holdAmountTest() {
        try {
            contractHoldOrderService.calHoldOrderHoldFeeAmount();
        } catch (Exception e) {
            log.info("-->", e);
        }
    }
}