From 76676ab94016b4deab91d7b76c34c152dd5bcf03 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 29 Jan 2021 16:57:56 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java | 3 +++
src/test/java/com/xcong/excoin/WholeTest.java | 6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java
index b2fd665..c316708 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java
@@ -487,6 +487,9 @@
if (CollUtil.isNotEmpty(list)) {
for (HoldOrderDataModel holdOrderDataModel : list) {
ContractHoldOrderEntity holdOrderEntity = contractHoldOrderDao.selectById(holdOrderDataModel.getId());
+ if (holdOrderEntity == null) {
+ continue;
+ }
contractHoldOrderDao.deleteById(holdOrderDataModel.getId());
diff --git a/src/test/java/com/xcong/excoin/WholeTest.java b/src/test/java/com/xcong/excoin/WholeTest.java
index a9f7f72..708ff9d 100644
--- a/src/test/java/com/xcong/excoin/WholeTest.java
+++ b/src/test/java/com/xcong/excoin/WholeTest.java
@@ -182,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