exchange.git - Gitblit

			@@ -198,6 +198,7 @@
			totalReturn = needReturn.subtract(contractOrderEntity.getClosingFeeAmount());
			// 总的是收益-平仓手续费
			BigDecimal totalBalance = profitLossPrice.subtract(contractOrderEntity.getClosingFeeAmount());

			memberWalletContractService.increaseWalletContractBalanceById(totalReturn, totalBalance, null, wallet.getId());

			// 流水记录 TODO 531e
			@@ -287,8 +288,8 @@
			// 更新钱包
			// 总的是收益-平仓手续费
			BigDecimal totalBalance = profitLossPrice.subtract(contractOrderEntity.getClosingFeeAmount());
			memberWalletContractService.increaseWalletContractBalanceById(totalReturn, totalBalance, null, wallet.getId());

			memberWalletContractService.increaseWalletContractBalanceById(totalReturn, totalBalance, null, wallet.getId());

			insertAccountFlow(order, wallet, profitLossPrice, "止盈平仓");

			@@ -371,16 +372,14 @@
			contractOrderService.save(contractOrderEntity);

			contractHoldOrderService.removeById(order.getId());
			log.info("保证金:{}", prePrice);
			log.info("盈亏:{}", profitLossPrice);
			// 将需要退回的减去手续费
			BigDecimal needReturn = prePrice.add(profitLossPrice);
			log.info("退回的钱:{}", needReturn);
			//总退回金额=保证金+收益-手续费
			totalReturn = needReturn.subtract(contractOrderEntity.getClosingFeeAmount());
			// 更新钱包
			// 总的是收益-平仓手续费
			BigDecimal totalBalance = profitLossPrice.subtract(contractOrderEntity.getClosingFeeAmount());

			memberWalletContractService.increaseWalletContractBalanceById(totalReturn, totalBalance, null, wallet.getId());

			insertAccountFlow(order, wallet, profitLossPrice, "开多止损平仓");
			@@ -425,7 +424,7 @@
			String symbol = order.getSymbol();
			Long memberId = order.getMemberId();
			// 本次需要退回的预付款
			BigDecimal prePrice = order.getPrePaymentAmount();
			BigDecimal prePrice = order.getBondAmount();
			MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memberId, "USDT");

			if (wallet != null) {
			@@ -555,6 +554,7 @@
			contractOrderEntity.setEntrustOpeningPrice(coinsCoinsOrder.getEntrustPrice());
			contractOrderEntity.setEntrustTime(coinsCoinsOrder.getCreateTime());
			contractOrderEntity.setOpeningTime(new Date());

			contractOrderEntity.setId(null);
			contractOrderService.save(contractOrderEntity);
			// 发送爆仓的队列