Helius
2020-08-14 f7064c80de1be60f2e73371f13769b06d7e56050
modify
2 files modified
42 ■■■■ changed files
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java 21 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/utils/ThreadPoolUtils.java 21 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
@@ -162,12 +162,12 @@
            BigDecimal subBondAmount = bondAmount.subtract(wholeHoldOrder.getBondAmount());
            log.info("保证金差值:{}", subBondAmount);
            BigDecimal forceClosingPrice = CalculateUtil.getForceSetPriceForWhole(submitOrderDto.getSymbol(), memberEntity);
            log.info("新预估强平价:{}", forceClosingPrice);
//            BigDecimal forceClosingPrice = CalculateUtil.getForceSetPriceForWhole(submitOrderDto.getSymbol(), memberEntity);
//            log.info("新预估强平价:{}", forceClosingPrice);
            ContractOrderEntity contractOrderEntity = ContractHoldOrderEntityMapper.INSTANCE.holdOrderToOrder(wholeHoldOrder);
            contractOrderEntity.setBondAmount(bondAmount.add(openFeePrice));
            contractOrderEntity.setForceClosingPrice(forceClosingPrice);
//            contractOrderEntity.setForceClosingPrice(forceClosingPrice);
            contractOrderEntity.setOpeningPrice(newOpenPrice);
            contractOrderEntity.setSymbolCnt(submitOrderDto.getSymbolCnt());
            contractOrderEntity.setOpeningTime(new Date());
@@ -180,7 +180,7 @@
            wholeHoldOrder.setBondAmount(bondAmount);
            wholeHoldOrder.setSymbolCnt(wholeHoldOrder.getSymbolCnt() + submitOrderDto.getSymbolCnt());
            wholeHoldOrder.setSymbolCntSale(wholeHoldOrder.getSymbolCntSale() + submitOrderDto.getSymbolCnt());
            wholeHoldOrder.setForceClosingPrice(forceClosingPrice);
//            wholeHoldOrder.setForceClosingPrice(forceClosingPrice);
            wholeHoldOrder.setPrePaymentAmount(prePaymentAmount);
            wholeHoldOrder.setOperateNo(wholeHoldOrder.getOperateNo() + 1);
            int i = contractHoldOrderDao.updateById(wholeHoldOrder);
@@ -188,8 +188,9 @@
                memberWalletContractDao.increaseWalletContractBalanceById(subBondAmount.add(openFeePrice).negate(), openFeePrice.negate(), null, walletContract.getId());
                // 发送爆仓消息
                sendOrderBombMsg(wholeHoldOrder.getId(), wholeHoldOrder.getOpeningType(), forceClosingPrice, wholeHoldOrder.getSymbol(), wholeHoldOrder.getOperateNo());
//                sendOrderBombMsg(wholeHoldOrder.getId(), wholeHoldOrder.getOpeningType(), forceClosingPrice, wholeHoldOrder.getSymbol(), wholeHoldOrder.getOperateNo());
                // 发送预估强平价
                ThreadPoolUtils.sendWholeForceClosingPrice(submitOrderDto.getSymbol(), memberEntity);
                // 计算佣金
                ThreadPoolUtils.calReturnMoney(memberEntity.getId(), openFeePrice, contractOrderEntity, AgentReturnEntity.ORDER_TYPE_OPEN);
@@ -221,7 +222,7 @@
        }
        // 预估强平价
        BigDecimal forceClosingPrice = CalculateUtil.getForceSetPriceForWhole(submitOrderDto.getSymbol(), memberEntity);
//        BigDecimal forceClosingPrice = CalculateUtil.getForceSetPriceForWhole(submitOrderDto.getSymbol(), memberEntity);
        ContractHoldOrderEntity holdOrderEntity = new ContractHoldOrderEntity();
        holdOrderEntity.setMemberId(memberEntity.getId());
@@ -233,7 +234,7 @@
        holdOrderEntity.setSymbolCntSale(submitOrderDto.getSymbolCnt());
        holdOrderEntity.setSymbolSku(lotNumber);
        holdOrderEntity.setLeverRatio(submitOrderDto.getLeverRatio());
        holdOrderEntity.setForceClosingPrice(forceClosingPrice);
//        holdOrderEntity.setForceClosingPrice(forceClosingPrice);
        holdOrderEntity.setOpeningFeeAmount(openFeePrice);
        holdOrderEntity.setOpeningPrice(openingPrice);
        holdOrderEntity.setOpeningType(submitOrderDto.getOrderType());
@@ -254,7 +255,9 @@
            memberWalletContractDao.increaseWalletContractBalanceById(prePaymentAmount.negate(), openFeePrice.negate(), null, walletContract.getId());
            // 发送爆仓消息
            sendOrderBombMsg(holdOrderEntity.getId(), holdOrderEntity.getOpeningType(), forceClosingPrice, holdOrderEntity.getSymbol(), holdOrderEntity.getOperateNo());
//            sendOrderBombMsg(holdOrderEntity.getId(), holdOrderEntity.getOpeningType(), forceClosingPrice, holdOrderEntity.getSymbol(), holdOrderEntity.getOperateNo());
            // 发送预估强平价
            ThreadPoolUtils.sendWholeForceClosingPrice(submitOrderDto.getSymbol(), memberEntity);
            // 计算佣金
            ThreadPoolUtils.calReturnMoney(memberEntity.getId(), contractOrderEntity.getOpeningFeeAmount(), contractOrderEntity, AgentReturnEntity.ORDER_TYPE_OPEN);
src/main/java/com/xcong/excoin/utils/ThreadPoolUtils.java
@@ -3,9 +3,11 @@
import com.xcong.excoin.modules.contract.entity.ContractOrderEntity;
import com.xcong.excoin.modules.contract.service.impl.OrderWebsocketServiceImpl;
import com.xcong.excoin.modules.documentary.service.FollowOrderOperationService;
import com.xcong.excoin.modules.member.entity.MemberEntity;
import com.xcong.excoin.utils.dingtalk.DingTalkUtils;
import lombok.extern.slf4j.Slf4j;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -64,4 +66,23 @@
            }
        });
    }
    /**
     * 全仓模式 -- 预估强平价
     *
     * @param symbol       币种
     * @param memberEntity 会员信息
     */
    public static void sendWholeForceClosingPrice(@NotNull String symbol, @NotNull MemberEntity memberEntity) {
        EXECUTOR.execute(new Runnable() {
            @Override
            public void run() {
                try {
                    CalculateUtil.getForceSetPriceForWhole(symbol, memberEntity);
                } catch (Exception e) {
                    log.error("全仓模式预估强平价", e);
                }
            }
        });
    }
}