From b3701765936f49182e5ed24d24c5c8351ce7eb92 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 26 Mar 2021 10:38:44 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderListVo.java | 8 ++++----
src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderDetailVo.java | 6 +++---
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java | 2 +-
src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderListVo.java | 22 +---------------------
src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderDetailVo.java | 10 +++++-----
5 files changed, 14 insertions(+), 34 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderDetailVo.java b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderDetailVo.java
index 721170d..f100a5c 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderDetailVo.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderDetailVo.java
@@ -75,15 +75,15 @@
}
public String getOpeningFeeAmount() {
- return CommonUtils.amountDotFormat(this.symbol, openingFeeAmount);
+ return openingFeeAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
}
public String getBondAmount() {
- return CommonUtils.amountDotFormat(this.symbol, bondAmount);
+ return bondAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
}
public String getHoldAmount() {
- return CommonUtils.amountDotFormat(this.symbol, holdAmount);
+ return holdAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
}
public String getForceClosingPrice() {
diff --git a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderListVo.java b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderListVo.java
index e0adbad..e9b3d26 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderListVo.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderListVo.java
@@ -84,28 +84,8 @@
return CommonUtils.amountDotFormat(this.symbol, openingPrice);
}
- private String dotFormat(BigDecimal price) {
- String priceFormat = "";
- switch (this.symbol) {
- case "BTC/USDT":
- case "ETH/USDT":
- case "LTC/USDT":
- case "BCH/USDT":
- priceFormat = price.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
- break;
- case "EOS/USDT":
- case "XRP/USDT":
- case "ETC/USDT":
- priceFormat = price.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
- break;
- default:
- priceFormat = price.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
- }
- return priceFormat;
- }
-
public String getBondAmount() {
- return CommonUtils.amountDotFormat(this.symbol, bondAmount);
+ return bondAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
}
public String getForceClosingPrice() {
diff --git a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderDetailVo.java b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderDetailVo.java
index 39dab12..143fdf6 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderDetailVo.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderDetailVo.java
@@ -90,11 +90,11 @@
}
public String getClosingFeeAmount() {
- return CommonUtils.amountDotFormat(this.symbol, closingFeeAmount);
+ return closingFeeAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
}
public String getRewardAmount() {
- return CommonUtils.amountDotFormat(this.symbol, rewardAmount);
+ return rewardAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
}
public String getOpeningPrice() {
@@ -102,15 +102,15 @@
}
public String getOpeningFeeAmount() {
- return CommonUtils.amountDotFormat(this.symbol, openingFeeAmount);
+ return openingFeeAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
}
public String getBondAmount() {
- return CommonUtils.amountDotFormat(this.symbol, bondAmount);
+ return bondAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
}
public String getHoldAmount() {
- return CommonUtils.amountDotFormat(this.symbol, holdAmount);
+ return holdAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
}
public String getStopLossPrice() {
diff --git a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderListVo.java b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderListVo.java
index e843f50..049d860 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderListVo.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderListVo.java
@@ -97,7 +97,7 @@
}
public String getOpeningFeeAmount() {
- return CommonUtils.amountDotFormat(this.symbol, openingFeeAmount);
+ return openingFeeAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
}
public String getForceClosingPrice() {
@@ -105,14 +105,14 @@
}
public String getClosingFeeAmount() {
- return CommonUtils.amountDotFormat(this.symbol, closingFeeAmount);
+ return closingFeeAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
}
public String getBondAmount() {
- return CommonUtils.amountDotFormat(this.symbol, bondAmount);
+ return bondAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
}
public String getRewardAmount() {
- return CommonUtils.amountDotFormat(this.symbol, rewardAmount);
+ return rewardAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
}
}
diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
index f13702b..8f05796 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
@@ -859,7 +859,7 @@
BigDecimal newPriceSymbol = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(symbol)));
List<ContractEntrustOrderEntity> entrustOrderEntities = contractEntrustOrderDao.selectEntrustOrderListByMemberId(memberEntity.getId());
- List<ContractHoldOrderEntity> holdOrderEntities = contractHoldOrderDao.selectHoldOrderListByMemberId(memberEntity.getId());
+ List<ContractHoldOrderEntity> holdOrderEntities = contractHoldOrderDao.selectHoldOrderListByMemberIdAndSymbolTest(memberEntity.getId(), ContractOrderEntity.CONTRACTTYPE_NORMAL);
MemberWalletContractEntity walletContractEntity = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberEntity.getId(), CoinTypeEnum.USDT.name());
// if (memberEntity.getContractPositionType().equals(ContractEntrustOrderEntity.POSITION_TYPE_ADD)) {
// // 当前合约委托单
--
Gitblit v1.9.1