From 03ae1e434c4f838d1f4290a945a5898a43b7a1c8 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 14 Apr 2021 18:48:14 +0800
Subject: [PATCH] Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
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 7bc06a4..576bac9 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
@@ -281,7 +281,11 @@
ThreadPoolUtils.sendWholePrice(memberEntity.getId());
// 提交成功
- return Result.ok(MessageSourceUtils.getString("member_service_0024"));
+ Result result = Result.ok(MessageSourceUtils.getString("member_service_0024"));
+ Map<String, Object> data = new HashMap<>();
+ data.put("baseUrl", AppContants.BASE_URL_L2);
+ result.setData(data);
+ return result;
}
// 提交失败
return Result.fail(MessageSourceUtils.getString("member_service_0067"));
@@ -389,7 +393,11 @@
// ThreadPoolUtils.sendFollowOrderTask(holdOrderEntity.getId());
}
// 提交成功
- return Result.ok(MessageSourceUtils.getString("member_service_0024"));
+ Result result = Result.ok(MessageSourceUtils.getString("member_service_0024"));
+ Map<String, Object> data = new HashMap<>();
+ data.put("baseUrl", AppContants.BASE_URL_L2);
+ result.setData(data);
+ return result;
}
// 提交失败
return Result.fail(MessageSourceUtils.getString("member_service_0067"));
@@ -531,7 +539,7 @@
holdOrderListVo.setReturnRate(returnRate);
holdOrderListVo.setProfitOrLoss(rewardRatio);
if (ContractEntrustOrderEntity.POSITION_TYPE_ALL == memberEntity.getContractPositionType()) {
- BigDecimal forcePrice = CalculateUtil.calWholePriceTwo(memberEntity, holdOrderEntity, 1, newPrice);
+ BigDecimal forcePrice = CalculateUtil.calWholePriceTwo(memberEntity, holdOrderEntity, 1);
// contractHoldOrderDao.updateForcePriceBySymbolAndMemberId(forcePrice, memberEntity.getId(), holdOrderEntity.getSymbol());
holdOrderListVo.setForceClosingPrice(forcePrice);
}
--
Gitblit v1.9.1