exchange.git - Gitblit

			@@ -303,8 +303,13 @@
			BigDecimal bondAmount = CalculateUtil.getBondAmount(holdOrderEntity.getOpeningPrice(), lotNumber, closeCnt, holdOrderEntity.getLeverRatio());

			log.info("bondAmount:{}", bondAmount);
			// 平仓手续费
			BigDecimal fee = holdOrderEntity.getOpeningFeeAmount().divide(BigDecimal.valueOf(holdOrderEntity.getSymbolCnt()), 8, BigDecimal.ROUND_DOWN).multiply(BigDecimal.valueOf(closeCnt));
			// 平仓手续费 TODO 可能需要修复手续费
			BigDecimal fee = BigDecimal.ZERO;
			if (holdOrderEntity.getSymbolCnt() != 0) {
			fee = holdOrderEntity.getOpeningFeeAmount().divide(BigDecimal.valueOf(holdOrderEntity.getSymbolCnt()), 8, BigDecimal.ROUND_DOWN).multiply(BigDecimal.valueOf(closeCnt));
			} else {
			fee = holdOrderEntity.getOpeningFeeAmount();
			}
			log.info("fee:{}", fee);
			ContractOrderEntity contractOrderEntity = ContractHoldOrderEntityMapper.INSTANCE.holdOrderToOrder(holdOrderEntity);
			contractOrderEntity.setId(null);
			@@ -318,6 +323,7 @@
			contractOrderDao.insert(contractOrderEntity);

			if (holdOrderEntity.getSymbolCntSale() != 0) {
			holdOrderEntity.setOpeningFeeAmount(holdOrderEntity.getOpeningFeeAmount().subtract(fee));
			contractHoldOrderDao.updateById(holdOrderEntity);
			} else {
			contractHoldOrderDao.deleteById(holdOrderEntity.getId());

			@@ -2,6 +2,7 @@

			import com.xcong.excoin.modules.contract.dao.ContractHoldOrderDao;
			import com.xcong.excoin.modules.contract.entity.ContractHoldOrderEntity;
			import com.xcong.excoin.modules.contract.service.RabbitOrderService;
			import com.xcong.excoin.modules.member.dao.MemberDao;
			import com.xcong.excoin.modules.member.entity.MemberEntity;
			import com.xcong.excoin.utils.CalculateUtil;
			@@ -11,6 +12,8 @@
			import org.springframework.boot.test.context.SpringBootTest;

			import javax.annotation.Resource;
			import java.util.ArrayList;
			import java.util.List;

			/**
			* @author wzy
			@@ -24,6 +27,9 @@
			@Autowired
			private ContractHoldOrderDao contractHoldOrderDao;

			@Autowired
			private RabbitOrderService rabbitOrderService;

			@Test
			public void forceClosePriceTest() {
			MemberEntity memberEntity = memberDao.selectById(5L);
			@@ -36,8 +42,10 @@

			@Test
			public void closingOrderTest() {
			ContractHoldOrderEntity holdOrderEntity = contractHoldOrderDao.selectById(822L);
			System.out.println(holdOrderEntity.getPositionType());
			List<Long> ids = new ArrayList<>();
			ids.add(836L);
			rabbitOrderService.cancelHoldOrder(ids);
			}


			}

	src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java	10 ●●●●● patch \| view \| raw \| blame \| history
	src/test/java/com/xcong/excoin/WholeTest.java	12 ●●●●● patch \| view \| raw \| blame \| history