From 84d6908d149ba8b0f8a4ea335e71bcc0778d17f0 Mon Sep 17 00:00:00 2001
From: gao <gaoleox@163>
Date: Wed, 27 May 2020 14:39:55 +0800
Subject: [PATCH] Merge branch 'master' of https://chonggaoxiao:xcg523511090712@gitee.com/chonggaoxiao/new_excoin.git
---
src/main/java/com/xcong/excoin/modules/coin/parameter/vo/MemberWalletContractInfoVo.java | 2 +-
src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java | 3 +++
src/main/java/com/xcong/excoin/modules/coin/parameter/vo/TransactionPageOfWalletCoinVo.java | 12 +++++++++++-
src/main/java/com/xcong/excoin/modules/coin/parameter/vo/MemberAccountMoneyChangeInfoVo.java | 2 +-
src/main/java/com/xcong/excoin/modules/coin/parameter/vo/MemberAccountMoneyChangeVo.java | 3 +--
src/main/java/com/xcong/excoin/modules/coin/parameter/vo/MemberWalletCoinVo.java | 2 +-
6 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/MemberAccountMoneyChangeInfoVo.java b/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/MemberAccountMoneyChangeInfoVo.java
index a60edeb..69306a0 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/MemberAccountMoneyChangeInfoVo.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/MemberAccountMoneyChangeInfoVo.java
@@ -10,7 +10,7 @@
import lombok.Data;
@Data
-@ApiModel(value = "资产交易记录详情信息返回", description = "资产交易记录详情信息返回")
+@ApiModel(value = "MemberAccountMoneyChangeInfoVo", description = "资产交易记录详情信息返回")
public class MemberAccountMoneyChangeInfoVo {
/**
diff --git a/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/MemberAccountMoneyChangeVo.java b/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/MemberAccountMoneyChangeVo.java
index cd7e4ef..c1de610 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/MemberAccountMoneyChangeVo.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/MemberAccountMoneyChangeVo.java
@@ -1,6 +1,5 @@
package com.xcong.excoin.modules.coin.parameter.vo;
-import java.math.BigDecimal;
import java.util.List;
import io.swagger.annotations.ApiModel;
@@ -8,7 +7,7 @@
import lombok.Data;
@Data
-@ApiModel(value = "资产交易记录信息返回", description = "资产交易记录信息返回")
+@ApiModel(value = "MemberAccountMoneyChangeVo", description = "资产交易记录信息返回")
public class MemberAccountMoneyChangeVo {
@ApiModelProperty(value = "资产交易记录详情信息")
diff --git a/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/MemberWalletCoinVo.java b/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/MemberWalletCoinVo.java
index abdd2de..ad0580e 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/MemberWalletCoinVo.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/MemberWalletCoinVo.java
@@ -11,7 +11,7 @@
* @author xy
*/
@Data
-@ApiModel(value = "币币账户信息返回", description = "币币账户信息返回")
+@ApiModel(value = "MemberWalletCoinVo", description = "币币账户信息返回")
public class MemberWalletCoinVo {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/MemberWalletContractInfoVo.java b/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/MemberWalletContractInfoVo.java
index a184442..89bcb7a 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/MemberWalletContractInfoVo.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/MemberWalletContractInfoVo.java
@@ -7,7 +7,7 @@
import lombok.Data;
@Data
-@ApiModel(value = "合约账户信息返回", description = "合约账户信息返回")
+@ApiModel(value = "MemberWalletContractInfoVo", description = "合约账户信息返回")
public class MemberWalletContractInfoVo {
/**
diff --git a/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/TransactionPageOfWalletCoinVo.java b/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/TransactionPageOfWalletCoinVo.java
index e011aeb..aeb2a2c 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/TransactionPageOfWalletCoinVo.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/TransactionPageOfWalletCoinVo.java
@@ -7,7 +7,7 @@
import lombok.Data;
@Data
-@ApiModel(value = "OrderWalletCoinDealVo", description = "进入交易页面返回")
+@ApiModel(value = "TransactionPageOfWalletCoinVo", description = "进入交易页面返回")
public class TransactionPageOfWalletCoinVo {
/**
* 是否自选
@@ -22,6 +22,16 @@
@ApiModelProperty(value = "点差")
private BigDecimal spread;
/**
+ * 币种
+ */
+ @ApiModelProperty(value = "币种")
+ private String symbol;
+ /**
+ * 买入卖出类型
+ */
+ @ApiModelProperty(value = "买入卖出类型")
+ private String type;
+ /**
* 手续费
*/
@ApiModelProperty(value = "手续费")
diff --git a/src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java b/src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java
index bcee12b..d3aa7ad 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java
@@ -144,6 +144,9 @@
transactionPageOfWalletCoinVo.setCnyUsdt(cnyUsdt.setScale(4, BigDecimal.ROUND_DOWN));
//换算成人民币的币种价格
transactionPageOfWalletCoinVo.setCurrentPriceCny(cnyUsdt.multiply(closePrice).setScale(4, BigDecimal.ROUND_DOWN));
+
+ transactionPageOfWalletCoinVo.setSymbol(symbol);
+ transactionPageOfWalletCoinVo.setType(type);
return Result.ok(transactionPageOfWalletCoinVo);
}
--
Gitblit v1.9.1