From 05c74ca131add20dbcf23dc109e63c21b3e2be29 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 24 Feb 2021 18:11:57 +0800
Subject: [PATCH] Merge branch 'whole_new_trc20' into whole_new
---
src/test/java/com/xcong/excoin/WholeTest.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/test/java/com/xcong/excoin/WholeTest.java b/src/test/java/com/xcong/excoin/WholeTest.java
index 2c7a5bb..708ff9d 100644
--- a/src/test/java/com/xcong/excoin/WholeTest.java
+++ b/src/test/java/com/xcong/excoin/WholeTest.java
@@ -13,6 +13,7 @@
import com.xcong.excoin.modules.member.entity.MemberEntity;
import com.xcong.excoin.modules.member.entity.MemberWalletContractEntity;
import com.xcong.excoin.rabbit.pricequeue.OrderModel;
+import com.xcong.excoin.rabbit.pricequeue.OrderOperatePriceService;
import com.xcong.excoin.rabbit.pricequeue.WebsocketPriceService;
import com.xcong.excoin.rabbit.producer.OrderProducer;
import com.xcong.excoin.utils.CalculateUtil;
@@ -171,7 +172,8 @@
@Test
public void mapTest() {
- websocketPriceService.wholeBomb();
+// websocketPriceService.wholeBomb();
+ OrderOperatePriceService.wholePriceDataOperation(63L);
}
@@ -180,13 +182,13 @@
// 8301.38608660
// System.out.println(new BigDecimal("9925.29996175").subtract(new BigDecimal("1623.91387515")));
- BigDecimal aa = new BigDecimal("1623.91387515").subtract(new BigDecimal("0.1").multiply(new BigDecimal(50)).multiply(new BigDecimal("32478.27750300")));
+ BigDecimal aa = new BigDecimal("9925.29996175").subtract(new BigDecimal("8301.38608660").negate()).subtract(new BigDecimal("1623.91387515")).subtract(new BigDecimal("0.1").multiply(new BigDecimal(50)).multiply(new BigDecimal("32478.27750300")));
BigDecimal bb = new BigDecimal(50).multiply(new BigDecimal("0.1"));
BigDecimal divide = aa.divide(bb, 8, BigDecimal.ROUND_DOWN);
System.out.println(divide);
// -(账户权益-委托保证金-全仓维持保证金-全仓未实现盈利-数量*面值*开仓价格)/(数量*面值)
- // 30818.00028568
- // -32153.49472797
+ // 30818.00028568 --
+ // 29157.72306836 --
}
}
--
Gitblit v1.9.1