From 8ec85f3d39662b276a049c9d9f27b6b3738c580f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 07 Jun 2020 15:59:41 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin
---
src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderListVo.java | 2 +-
src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java b/src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java
index f421d64..93c2151 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java
@@ -183,9 +183,9 @@
*/
//获取当前的合约持仓
//获取实时盈亏
- BigDecimal profitAndLoss = new BigDecimal("50.000");
+ BigDecimal profitAndLoss = new BigDecimal("0");
//获取总付款
- BigDecimal totalPayment = new BigDecimal("50.000");
+ BigDecimal totalPayment = new BigDecimal("0");
BigDecimal lastTotalBalance = new BigDecimal("0");
BigDecimal totalBalance = walletContract.getTotalBalance();
lastTotalBalance = totalBalance.add(profitAndLoss);
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 8d99c52..37832fe 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
@@ -42,7 +42,7 @@
private int symbolCnt;
@ApiModelProperty("已实现盈亏")
- private BigDecimal rewardRatio;
+ private BigDecimal rewardAmount;
@ApiModelProperty("平仓类型 2平多3平空4爆仓平多5爆仓平空6止盈平多7止盈平空8止损平多9止损平空")
private int closingType;
--
Gitblit v1.9.1