modify

Helius

2021-01-28 54f9eb4b13a4bde056fb38247dcb7e124a2fa238

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

@@ -244,6 +244,7 @@

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

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

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

                        // 全仓模式，止盈/止损 删除委托平仓
                        if (ContractEntrustOrderEntity.POSITION_TYPE_ALL == order.getPositionType()) {
                            ThreadPoolUtils.sendWholePrice(memberId);
                            deleteEntrustCloseOrder(order.getOrderNo());
                        }
                    }
@@ -711,6 +715,8 @@
                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 +861,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 +878,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;
//                // 开多