Merge branch 'whole_new' of https://gitee.com/chonggaoxiao/new_excoin.git i...

xiaoyong931011

2021-01-29 4a8c4e149d3c1ee75e99d64632d71eab454f30b6

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

@@ -487,6 +487,9 @@
        if (CollUtil.isNotEmpty(list)) {
            for (HoldOrderDataModel holdOrderDataModel : list) {
                ContractHoldOrderEntity holdOrderEntity = contractHoldOrderDao.selectById(holdOrderDataModel.getId());
                if (holdOrderEntity == null) {
                    continue;
                }

                contractHoldOrderDao.deleteById(holdOrderDataModel.getId());

@@ -500,7 +503,7 @@

                BigDecimal rewardRatio = holdOrderDataModel.getRewardAmount().divide(holdOrderEntity.getBondAmount().subtract(holdOrderEntity.getOpeningFeeAmount()), 8, BigDecimal.ROUND_DOWN);
                contractOrderEntity.setRewardRatio(rewardRatio);
                contractOrderEntity.setRewardAmount(holdOrderDataModel.getRewardAmount().add(contractOrderEntity.getBondAmount()));
                contractOrderEntity.setRewardAmount(holdOrderDataModel.getRewardAmount().add(contractOrderEntity.getBondAmount().negate()));
                contractOrderEntity.setClosingPrice(holdOrderDataModel.getClosingPrice());
//                contractOrderEntity.setForceClosingPrice(holdOrderDataModel.getClosingPrice());