From 1578973506d65ab44b4835431f027a6e925dabbc Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 25 Mar 2021 11:52:12 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderListVo.java | 3 +++
src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderListVo.java | 7 ++++---
src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberAvivableCoinInfoVo.java | 5 ++++-
src/main/java/com/xcong/excoin/utils/mail/SubMailSend.java | 6 +++---
src/main/java/com/xcong/excoin/utils/CommonUtils.java | 34 ++++++++++++++++++++++++++++++++++
5 files changed, 48 insertions(+), 7 deletions(-)
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 b37f5df..e0adbad 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
@@ -1,6 +1,7 @@
package com.xcong.excoin.modules.contract.parameter.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xcong.excoin.utils.CommonUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -80,7 +81,7 @@
public String getOpeningPrice() {
- return dotFormat(openingPrice);
+ return CommonUtils.amountDotFormat(this.symbol, openingPrice);
}
private String dotFormat(BigDecimal price) {
@@ -104,11 +105,11 @@
}
public String getBondAmount() {
- return dotFormat(bondAmount);
+ return CommonUtils.amountDotFormat(this.symbol, bondAmount);
}
public String getForceClosingPrice() {
- return dotFormat(forceClosingPrice);
+ return CommonUtils.amountDotFormat(this.symbol, forceClosingPrice);
}
public String getProfitOrLoss() {
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 235ab79..c8c4bf9 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
@@ -80,6 +80,9 @@
@ApiModelProperty(value = "订单编号")
private String orderNo;
+ @ApiModelProperty(value = "币种")
+ private String symbol;
+
public String getOrderNo() {
return StrUtil.isNotBlank(orderNo) ? orderNo.substring(orderNo.length() - 6) : "";
}
diff --git a/src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberAvivableCoinInfoVo.java b/src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberAvivableCoinInfoVo.java
index 7231563..52b3a7f 100644
--- a/src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberAvivableCoinInfoVo.java
+++ b/src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberAvivableCoinInfoVo.java
@@ -18,5 +18,8 @@
@ApiModelProperty(value = "USDT链名")
private String lable;
-
+
+ public BigDecimal getAvailableBalance() {
+ return availableBalance == null ? availableBalance : availableBalance.setScale(4, BigDecimal.ROUND_DOWN);
+ }
}
diff --git a/src/main/java/com/xcong/excoin/utils/CommonUtils.java b/src/main/java/com/xcong/excoin/utils/CommonUtils.java
new file mode 100644
index 0000000..006d6cd
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/utils/CommonUtils.java
@@ -0,0 +1,34 @@
+package com.xcong.excoin.utils;
+
+
+import java.math.BigDecimal;
+
+public class CommonUtils {
+
+ /**
+ * 根据币种设置小数点
+ *
+ * @param symbol
+ * @param price
+ * @return
+ */
+ public static String amountDotFormat(String symbol, BigDecimal price) {
+ String priceFormat = "";
+ switch (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;
+ }
+}
diff --git a/src/main/java/com/xcong/excoin/utils/mail/SubMailSend.java b/src/main/java/com/xcong/excoin/utils/mail/SubMailSend.java
index 4663a48..fe23b8f 100644
--- a/src/main/java/com/xcong/excoin/utils/mail/SubMailSend.java
+++ b/src/main/java/com/xcong/excoin/utils/mail/SubMailSend.java
@@ -43,7 +43,7 @@
private static final String APP_ID = "16082";
private static final String APP_KEY = "f34c792a1112c16c190ed7190d386c4f";
- private static final String FROM = "biue@submail.biue.me";
+ private static final String FROM = "hibit@submail.hibit.cc";
private static final String SIGN_TYPE = "";
/**
@@ -57,7 +57,7 @@
JSONObject vars = new JSONObject();
vars.put("code", code);
- String project = "zoKVB";
+ String project = "CVj6P";
return request(vars, project, to);
}
@@ -73,7 +73,7 @@
JSONObject vars = new JSONObject();
vars.put("time", time);
vars.put("orderNo", orderNo);
- String project = "x820C2";
+ String project = "4DvTC2";
return request(vars, project, to);
}
--
Gitblit v1.9.1