From 87f7475be96627ef47148b26a7541c5f7848dc18 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 03 Jun 2020 18:18:53 +0800
Subject: [PATCH] modify contract wallet update
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java
index c6c2f49..cb215e9 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java
@@ -148,8 +148,8 @@
System.out.println("执行操作");
// 止盈价
String symbol = order.getSymbol();
- // 本次需要退回的预付款
- BigDecimal prePrice = order.getPrePaymentAmount();
+ // 本次需要退回的保证金
+ BigDecimal prePrice = order.getBondAmount();
Long memberId = order.getMemberId();
MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memberId, "USDT");
if (wallet != null) {
@@ -164,7 +164,7 @@
// 盈亏额度= (当前的币种的平仓价-下单时的建仓价)*购买的手数/规格*倍率
BigDecimal profitLossPrice = (closePrice
.subtract(order.getOpeningPrice()))
- .multiply(new BigDecimal(currentFlat + ""))
+ .multiply(new BigDecimal(currentFlat))
.multiply(symbolSku).setScale(8, BigDecimal.ROUND_DOWN);
MemberEntity memberEntity = memberService.getById(memberId);
@@ -554,7 +554,7 @@
producer.sendPriceOperate(JSONObject.toJSONString(model));
}
// 扣除手续费
- BigDecimal totalBalance = wallet.getTotalBalance().subtract(openFeePrice);
+ BigDecimal totalBalance = openFeePrice.negate();
contractEntrustOrderService.removeById(coinsCoinsOrder.getId());
memberWalletContractService.increaseWalletContractBalanceById(null, totalBalance, null, wallet.getId());
// TODO 531 待写
--
Gitblit v1.9.1