Helius
2021-03-26 abaa17a096732bd5177b3b93ee5ad73c2bff7e09
modify
3 files modified
14 ■■■■ changed files
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java 3 ●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/quartz/job/BlockCoinUpdateJob.java 2 ●●● patch | view | raw | blame | history
src/test/java/com/xcong/excoin/MemberSettingTest.java 9 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
@@ -1139,7 +1139,7 @@
                    holdAmount = BigDecimal.ZERO;
                }
                BigDecimal thisTimeHold = holdOrderEntity.getBondAmount().multiply(tradeSettingEntity.getDoingRatio());
                BigDecimal thisTimeHold = holdOrderEntity.getBondAmount().subtract(holdOrderEntity.getOpeningFeeAmount()).multiply(tradeSettingEntity.getDoingRatio());
                log.info("订单编号:{}, 持仓费:{}", holdOrderEntity.getOrderNo(), thisTimeHold);
                MemberEntity memberEntity = memberDao.selectById(holdOrderEntity.getMemberId());
@@ -1153,6 +1153,7 @@
                holdOrderEntity.setOperateNo(holdOrderEntity.getOperateNo() + 1);
                contractHoldOrderDao.updateById(holdOrderEntity);
                memberWalletContractDao.increaseWalletContractBalanceById(null, thisTimeHold.negate(), null, holdOrderEntity.getMemberId());
                if (ContractEntrustOrderEntity.POSITION_TYPE_ADD == holdOrderEntity.getPositionType()) {
                    // 发送爆仓消息
                    sendOrderBombMsg(holdOrderEntity.getId(), holdOrderEntity.getOpeningType(), newForcePrice, holdOrderEntity.getSymbol(), holdOrderEntity.getOperateNo(), holdOrderEntity.getMemberId());
src/main/java/com/xcong/excoin/quartz/job/BlockCoinUpdateJob.java
@@ -56,7 +56,7 @@
    /**
     * eth 同步
     */
    @Scheduled(cron = "0 1/20 * * * ? ")
//    @Scheduled(cron = "0 1/20 * * * ? ")
    public void ethUpdate() {
        blockCoinService.updateEth();
    }
src/test/java/com/xcong/excoin/MemberSettingTest.java
@@ -1,5 +1,6 @@
package com.xcong.excoin;
import com.xcong.excoin.modules.contract.service.ContractHoldOrderService;
import com.xcong.excoin.modules.member.dao.MemberDao;
import com.xcong.excoin.modules.member.dao.MemberSettingDao;
import com.xcong.excoin.modules.member.entity.MemberEntity;
@@ -48,4 +49,12 @@
        memberSettingDao.batchInsert(list);
    }
    @Autowired
    private ContractHoldOrderService contractHoldOrderService;
    @Test
    public void holdTest() {
        contractHoldOrderService.calHoldFeeAmountForBondAmount();
    }
}