exchange.git - Gitblit

			@@ -896,7 +896,7 @@
			} else {
			BigDecimal available = walletContractEntity.getAvailableBalance();
			BigDecimal lessAmount = thisTimeHold.subtract(available);
			MemberEntity memberEntity = memberDao.selectById(holdOrderEntity.getId());
			MemberEntity memberEntity = memberDao.selectById(holdOrderEntity.getMemberId());
			memberWalletContractDao.increaseWalletContractBalanceById(available.negate(), available.negate(), null, walletContractEntity.getId());

			BigDecimal newBondAmount = holdOrderEntity.getBondAmount().subtract(lessAmount);

			@@ -46,7 +46,7 @@
			/**
			* 持仓费计算
			*/
			@Scheduled(cron = "0 0 8/8 * * ?")
			@Scheduled(cron = "0 0 16/8 * * ?")
			public void updateDoingPrice() {
			log.info("#持仓费计算#");
			try {

			@@ -45,21 +45,15 @@
			MemberSettingDao memberSettingDao = SpringContextHolder.getBean(MemberSettingDao.class);
			BigDecimal forcePrice = BigDecimal.ZERO;
			BigDecimal money = bondAmount.divide(new BigDecimal(symbolSkuNumber).multiply(lotNumber), 8, BigDecimal.ROUND_DOWN);
			if (member.getIsForce() == 1) {
			MemberSettingEntity memberSetting = memberSettingDao.selectMemberSettingByMemberId(member.getId());
			money = money.multiply(memberSetting.getForceParam().multiply(BigDecimal.valueOf(100)));
			}
			//卖空
			if (type == 2) {
			forcePrice = money.add(openPrice);
			if (member.getIsForce() == 1) {
			MemberSettingEntity memberSetting = memberSettingDao.selectMemberSettingByMemberId(member.getId());
			//预估强平价 = 预估强平价-预估强平价*系数
			forcePrice = forcePrice.subtract(forcePrice.multiply(memberSetting.getForceParam() == null ? BigDecimal.ZERO : memberSetting.getForceParam()));
			}
			} else {//开多
			forcePrice = openPrice.subtract(money);
			if (member.getIsForce() == 1) {
			MemberSettingEntity memberSetting = memberSettingDao.selectMemberSettingByMemberId(member.getId());
			//预估强平价 = 预估强平价-预估强平价*系数
			forcePrice = forcePrice.add(forcePrice.multiply(memberSetting.getForceParam() == null ? BigDecimal.ZERO : memberSetting.getForceParam()));
			}
			}
			if (forcePrice.compareTo(BigDecimal.ZERO) < 0) {
			forcePrice = BigDecimal.ZERO;

			@@ -17,6 +17,7 @@
			import com.xcong.excoin.modules.symbols.service.SymbolsService;
			import com.xcong.excoin.rabbit.producer.OrderProducer;
			import com.xcong.excoin.utils.CacheSettingUtils;
			import com.xcong.excoin.utils.CalculateUtil;
			import com.xcong.excoin.utils.CoinTypeConvert;
			import com.xcong.excoin.utils.RedisUtils;
			import lombok.extern.slf4j.Slf4j;
			@@ -117,4 +118,12 @@
			log.info("----->{}", totalProfitOrLess);

			}

			@Test
			public void forceTest() {
			ContractHoldOrderEntity hold = contractHoldOrderDao.selectById(28284L);
			MemberEntity memberEntity = memberDao.selectById(6L);
			BigDecimal forceSetPrice = CalculateUtil.getForceSetPrice(hold.getBondAmount(), hold.getOpeningPrice(), hold.getSymbolCnt(), hold.getSymbolSku(), hold.getOpeningType(), memberEntity);
			System.out.println(forceSetPrice);
			}
			}

	src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java	2 ●●●●● patch \| view \| raw \| blame \| history
	src/main/java/com/xcong/excoin/quartz/job/LoopExecutorJob.java	2 ●●●●● patch \| view \| raw \| blame \| history
	src/main/java/com/xcong/excoin/utils/CalculateUtil.java	14 ●●●●● patch \| view \| raw \| blame \| history
	src/test/java/com/xcong/excoin/SymbolsTest.java	9 ●●●●● patch \| view \| raw \| blame \| history