Merge remote-tracking branch 'origin/whole' into whole

zainali5120

2020-10-25 bef3b23ca8918a355f6ff9751b46f4c35970f19e

 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);
    }