From 0229fc9025f20572cb5f4f584fafda25fee929e3 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Wed, 14 Apr 2021 19:46:10 +0800 Subject: [PATCH] modify --- 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 e649f61..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); + BigDecimal forcePrice = CalculateUtil.calWholePriceTwo(memberEntity, holdOrderEntity, 1); // contractHoldOrderDao.updateForcePriceBySymbolAndMemberId(forcePrice, memberEntity.getId(), holdOrderEntity.getSymbol()); holdOrderListVo.setForceClosingPrice(forcePrice); } -- Gitblit v1.9.1