modify

Helius

2021-01-29 bee6b602b0bf4dfb7956a61b39ba03a240d89d6f

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

@@ -353,6 +353,8 @@

            memberWalletContractDao.increaseWalletContractBalanceById(changeAmount, total, null, walletContract.getId());

            ThreadPoolUtils.sendWholePrice(memberEntity.getId());

            ThreadPoolUtils.sendWholeForceClosingPrice(holdOrderEntity.getSymbol(), memberEntity);
            // 计算佣金
            ThreadPoolUtils.calReturnMoney(memberEntity.getId(), fee, contractOrderEntity, AgentReturnEntity.ORDER_TYPE_CLOSE);
@@ -468,6 +470,9 @@
        memberWalletContractDao.increaseWalletContractBalanceById(changeAmount, total, null, walletContract.getId());

        contractEntrustOrderDao.deleteById(entrustOrder.getId());

        ThreadPoolUtils.sendWholePrice(memberEntity.getId());

        ThreadPoolUtils.sendWholeForceClosingPrice(holdOrderEntity.getSymbol(), memberEntity);
        // 计算佣金
        ThreadPoolUtils.calReturnMoney(memberEntity.getId(), fee, contractOrderEntity, AgentReturnEntity.ORDER_TYPE_CLOSE);
@@ -495,9 +500,9 @@

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

                // 订单状态转换
                if (ContractOrderEntity.ORDER_TYPE_OPEN_MORE == contractOrderEntity.getOrderType()) {
@@ -506,7 +511,6 @@
                    contractOrderEntity.setOrderType(ContractOrderEntity.ORDER_TYPE_CLOSE_LESS);
                }
                contractOrderEntity.setClosingTime(new Date());
                contractOrderEntity.setClosingFeeAmount(holdOrderEntity.getOpeningFeeAmount());

                contractOrderDao.insert(contractOrderEntity);
            }