modify

Helius

2021-02-02 d7d0550da50ee64d0916cde55ed5991de8e74c64

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

@@ -195,7 +195,7 @@
                        contractOrderEntity.setId(null);

                        // 本次平仓数量
                        int currentFlat = order.getSymbolCnt();
                        int currentFlat = order.getSymbolCntSale();
                        BigDecimal symbolSku = cacheSettingUtils.getSymbolSku(order.getSymbol());
                        // 盈亏额度= (当前的币种的平仓价-下单时的建仓价)*购买的手数/规格*倍率
                        BigDecimal profitLossPrice = (closePrice
@@ -244,6 +244,7 @@

                        // 全仓模式，止盈/止损 删除委托平仓
                        if (ContractEntrustOrderEntity.POSITION_TYPE_ALL == order.getPositionType()) {
                            ThreadPoolUtils.sendWholePrice(memberId);
                            deleteEntrustCloseOrder(order.getOrderNo());
                        }
                    }
@@ -295,7 +296,7 @@
                        contractOrderEntity.setId(null);

                        // 本次平仓数量
                        int currentFlat = order.getSymbolCnt();
                        int currentFlat = order.getSymbolCntSale();
                        BigDecimal symbolSku = cacheSettingUtils.getSymbolSku(order.getSymbol());
                        // 盈亏额度= (当前的币种的平仓价-下单时的建仓价)*购买的手数/规格*倍率
                        BigDecimal profitLossPrice = (order.getOpeningPrice()
@@ -344,6 +345,7 @@

                        // 全仓模式，止盈/止损 删除委托平仓
                        if (ContractEntrustOrderEntity.POSITION_TYPE_ALL == order.getPositionType()) {
                            ThreadPoolUtils.sendWholePrice(memberId);
                            deleteEntrustCloseOrder(order.getOrderNo());
                        }
                    }
@@ -396,7 +398,7 @@
                        contractOrderEntity.setId(null);

                        // 本次平仓数量
                        int currentFlat = order.getSymbolCnt();
                        int currentFlat = order.getSymbolCntSale();
                        BigDecimal symbolSku = cacheSettingUtils.getSymbolSku(order.getSymbol());
                        // 盈亏额度= (当前的币种的平仓价-下单时的建仓价)*购买的手数/规格*倍率
                        BigDecimal profitLossPrice = (closePrice
@@ -442,6 +444,7 @@

                        // 全仓模式，止盈/止损 删除委托平仓
                        if (ContractEntrustOrderEntity.POSITION_TYPE_ALL == order.getPositionType()) {
                            ThreadPoolUtils.sendWholePrice(memberId);
                            deleteEntrustCloseOrder(order.getOrderNo());
                        }
                    }
@@ -493,7 +496,7 @@
                        contractOrderEntity.setId(null);

                        // 本次平仓数量
                        int currentFlat = order.getSymbolCnt();
                        int currentFlat = order.getSymbolCntSale();
                        BigDecimal symbolSku = cacheSettingUtils.getSymbolSku(order.getSymbol());
                        // 盈亏额度= (当前的币种的平仓价-下单时的建仓价)*购买的手数/规格*倍率
                        BigDecimal profitLossPrice = (order.getOpeningPrice()
@@ -539,6 +542,7 @@

                        // 全仓模式，止盈/止损 删除委托平仓
                        if (ContractEntrustOrderEntity.POSITION_TYPE_ALL == order.getPositionType()) {
                            ThreadPoolUtils.sendWholePrice(memberId);
                            deleteEntrustCloseOrder(order.getOrderNo());
                        }
                    }
@@ -619,6 +623,7 @@
                contractHoldOrderEntity.setOpeningPrice(entrustPrice);
                contractHoldOrderEntity.setTradeType(ContractHoldOrderEntity.TRADE_TYPE_LIMIT);
                contractHoldOrderEntity.setOperateNo(1);
                contractHoldOrderEntity.setSymbolCntSale(contractHoldOrderEntity.getSymbolCnt());
                contractHoldOrderService.save(contractHoldOrderEntity);

                // 需要一个历史插入
@@ -700,6 +705,7 @@
            holdOrderEntity.setOperateNo(1);
            // 设置合约类型
            holdOrderEntity.setContractType(ContractOrderEntity.CONTRACTTYPE_NORMAL);
            holdOrderEntity.setHoldBond(CalculateUtil.calMemberHoldBond(holdOrderEntity));

            ContractOrderEntity contractOrderEntity = ContractHoldOrderEntityMapper.INSTANCE.holdOrderToOrder(holdOrderEntity);
            contractOrderEntity.setOpeningTime(new Date());
@@ -710,6 +716,8 @@
            if (isSuccess) {
                contractEntrustOrderService.removeById(entrustOrder.getId());
                memberWalletContractService.increaseWalletContractBalanceById(null, openFeePrice.negate(), entrustOrder.getBondAmount().negate(), wallet.getId());

                ThreadPoolUtils.sendWholePrice(member.getId());

                // 发送强平价
                ThreadPoolUtils.sendWholeForceClosingPrice(entrustOrder.getSymbol(), member);
@@ -855,7 +863,7 @@
                contractOrderService.save(contractOrderEntity);

                //更新用户钱包数据
                MemberWalletContractEntity usdt = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memId, "USDT");
                MemberWalletContractEntity usdt = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memId, CoinTypeConvert.convertContractTypeToCoin(coinsOrder.getSymbol()));

                // 减去的时候用负数
                BigDecimal totalPrice = coinsOrder.getBondAmount().negate();
@@ -872,7 +880,7 @@
                record.setPrice(coinsOrder.getBondAmount());
                memberAccountFlowEntityDao.insert(record);
            } else {
                MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memId, CoinTypeConvert.convertContractTypeToCoin(coinsOrder.getSymbol()));
                MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memId, "USDT");

//                BigDecimal rewardRatio = BigDecimal.ZERO;
//                // 开多