From fbd427bdd218c37a7e0cd20905491dcf2db3eb04 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Sat, 10 Oct 2020 17:39:20 +0800 Subject: [PATCH] modify --- src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java | 6 ++++++ src/main/java/com/xcong/excoin/modules/contract/parameter/vo/ContractMoneyInfoVo.java | 3 +++ src/main/java/com/xcong/excoin/modules/symbols/service/SymbolsService.java | 3 +++ src/main/java/com/xcong/excoin/modules/symbols/service/impl/SymbolsServiceImpl.java | 1 + 4 files changed, 13 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/ContractMoneyInfoVo.java b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/ContractMoneyInfoVo.java index ec0d97d..06c142c 100644 --- a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/ContractMoneyInfoVo.java +++ b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/ContractMoneyInfoVo.java @@ -41,6 +41,9 @@ @ApiModelProperty(value = "规格") private BigDecimal symbolSku; + @ApiModelProperty(value = "涨跌幅") + private BigDecimal upOrDown; + public BigDecimal getBeUsedBondAmount() { return beUsedBondAmount.setScale(4, BigDecimal.ROUND_DOWN); } 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 f05568c..2f4daa2 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 @@ -34,6 +34,8 @@ import com.xcong.excoin.modules.member.entity.*; import com.xcong.excoin.modules.platform.dao.TradeSettingDao; import com.xcong.excoin.modules.platform.entity.PlatformTradeSettingEntity; +import com.xcong.excoin.modules.symbols.parameter.vo.HomeSymbolsVo; +import com.xcong.excoin.modules.symbols.service.SymbolsService; import com.xcong.excoin.rabbit.producer.OrderProducer; import com.xcong.excoin.utils.*; import com.xcong.excoin.rabbit.pricequeue.OrderModel; @@ -93,6 +95,8 @@ private FollowTraderInfoDao followTraderInfoDao; @Resource private FollowFollowerOrderRelationDao followFollowerOrderRelationDao; + @Resource + private SymbolsService symbolsService; @Transactional(rollbackFor = Exception.class) @Override @@ -805,6 +809,7 @@ // contractMoneyInfoVo.setAvailableBalance(available); // } + HomeSymbolsVo symbolReturnData = symbolsService.getSymbolReturnData(symbol); contractMoneyInfoVo.setBeUsedBondAmount(beUsedBondAmount); contractMoneyInfoVo.setFrozenBondAmount(frozenBondAmount); @@ -815,6 +820,7 @@ contractMoneyInfoVo.setNewPrice(newPriceSymbol); contractMoneyInfoVo.setSymbolSku(cacheSettingUtils.getSymbolSku(symbol)); contractMoneyInfoVo.setLeverRate(rateEntity.getLevelRateUp()); + contractMoneyInfoVo.setUpOrDown(symbolReturnData.getUpOrDown()); return Result.ok(contractMoneyInfoVo); } diff --git a/src/main/java/com/xcong/excoin/modules/symbols/service/SymbolsService.java b/src/main/java/com/xcong/excoin/modules/symbols/service/SymbolsService.java index be91c71..c7c54b3 100644 --- a/src/main/java/com/xcong/excoin/modules/symbols/service/SymbolsService.java +++ b/src/main/java/com/xcong/excoin/modules/symbols/service/SymbolsService.java @@ -3,6 +3,7 @@ import com.xcong.excoin.common.response.Result; import com.xcong.excoin.modules.symbols.parameter.dto.KlineDetailDto; +import com.xcong.excoin.modules.symbols.parameter.vo.HomeSymbolsVo; /** * @author wzy @@ -18,4 +19,6 @@ public Result findKlineDetails(KlineDetailDto klineDetailDto); + public HomeSymbolsVo getSymbolReturnData(String symbol); + } diff --git a/src/main/java/com/xcong/excoin/modules/symbols/service/impl/SymbolsServiceImpl.java b/src/main/java/com/xcong/excoin/modules/symbols/service/impl/SymbolsServiceImpl.java index 95d294a..e714412 100644 --- a/src/main/java/com/xcong/excoin/modules/symbols/service/impl/SymbolsServiceImpl.java +++ b/src/main/java/com/xcong/excoin/modules/symbols/service/impl/SymbolsServiceImpl.java @@ -124,6 +124,7 @@ return Result.ok(homeSymbolsVo); } + @Override public HomeSymbolsVo getSymbolReturnData(String symbol) { PlatformCnyUsdtExchangeEntity cnyUsdtExchange = platformCnyUsdtExchangeDao.getCNYAndUSDTOne(); // 获取当日k线数据 -- Gitblit v1.9.1