exchange.git - Gitblit

			@@ -213,7 +213,7 @@
			memberWalletContractDao.increaseWalletContractBalanceById(prePaymentAmount.negate(), openFeePrice.negate(), null, walletContract.getId());

			// 发送预估强平价
			ThreadPoolUtils.sendWholeForceClosingPrice(submitOrderDto.getSymbol(), memberEntity);
			// ThreadPoolUtils.sendWholeForceClosingPrice(submitOrderDto.getSymbol(), memberEntity);
			// 计算佣金
			ThreadPoolUtils.calReturnMoney(memberEntity.getId(), openFeePrice, contractOrderEntity, AgentReturnEntity.ORDER_TYPE_OPEN);

			@@ -266,7 +266,7 @@
			memberWalletContractDao.increaseWalletContractBalanceById(prePaymentAmount.negate(), openFeePrice.negate(), null, walletContract.getId());

			// 发送预估强平价
			ThreadPoolUtils.sendWholeForceClosingPrice(submitOrderDto.getSymbol(), memberEntity);
			// ThreadPoolUtils.sendWholeForceClosingPrice(submitOrderDto.getSymbol(), memberEntity);
			// 计算佣金
			ThreadPoolUtils.calReturnMoney(memberEntity.getId(), contractOrderEntity.getOpeningFeeAmount(), contractOrderEntity, AgentReturnEntity.ORDER_TYPE_OPEN);

			@@ -385,17 +385,7 @@

			// 若该用户为交易员且开启带单模式，则发送带单异步
			if (isOpenFollow) {
			FollowFollowerOrderRelationEntity relationEntity = new FollowFollowerOrderRelationEntity();
			relationEntity.setIsShow(FollowFollowerOrderRelationEntity.IS_SHOW_Y);
			relationEntity.setMemberId(holdOrderEntity.getMemberId());
			relationEntity.setOrderId(holdOrderEntity.getId());
			relationEntity.setOrderType(FollowFollowerOrderRelationEntity.ORDER_TYPE_HOLD);
			relationEntity.setTradeId(tradeInfo.getId());
			relationEntity.setTradeMemberId(tradeInfo.getMemberId());
			relationEntity.setTradeOrderNo(holdOrderEntity.getOrderNo());
			followFollowerOrderRelationDao.insert(relationEntity);

			followProducer.sendAddFollowOrder(holdOrderEntity.getId());
			sendFollowOrder(tradeInfo, holdOrderEntity);
			// ThreadPoolUtils.sendFollowOrderTask(holdOrderEntity.getId());
			}
			// 提交成功
			@@ -405,6 +395,20 @@
			return Result.fail(MessageSourceUtils.getString("member_service_0067"));
			}

			@Override
			public void sendFollowOrder(FollowTraderInfoEntity tradeInfo, ContractHoldOrderEntity holdOrderEntity) {
			FollowFollowerOrderRelationEntity relationEntity = new FollowFollowerOrderRelationEntity();
			relationEntity.setIsShow(FollowFollowerOrderRelationEntity.IS_SHOW_Y);
			relationEntity.setMemberId(holdOrderEntity.getMemberId());
			relationEntity.setOrderId(holdOrderEntity.getId());
			relationEntity.setOrderType(FollowFollowerOrderRelationEntity.ORDER_TYPE_HOLD);
			relationEntity.setTradeId(tradeInfo.getId());
			relationEntity.setTradeMemberId(tradeInfo.getMemberId());
			relationEntity.setTradeOrderNo(holdOrderEntity.getOrderNo());
			followFollowerOrderRelationDao.insert(relationEntity);

			followProducer.sendAddFollowOrder(holdOrderEntity.getId());
			}

			/**
			* 全仓模式--若当前已经存在持仓，则合并当前持仓
			@@ -527,7 +531,8 @@
			holdOrderListVo.setReturnRate(returnRate);
			holdOrderListVo.setProfitOrLoss(rewardRatio);
			if (ContractEntrustOrderEntity.POSITION_TYPE_ALL == memberEntity.getContractPositionType()) {
			BigDecimal forcePrice = CalculateUtil.getForceSetPriceForWhole(holdOrderEntity.getSymbol(), memberEntity);
			BigDecimal forcePrice = CalculateUtil.calWholePriceTwo(memberEntity, holdOrderEntity);
			// contractHoldOrderDao.updateForcePriceBySymbolAndMemberId(forcePrice, memberEntity.getId(), holdOrderEntity.getSymbol());
			holdOrderListVo.setForceClosingPrice(forcePrice);
			}
			resultList.add(holdOrderListVo);
			@@ -648,7 +653,7 @@
			return Result.loading("loading_type");
			}

			List<ContractHoldOrderEntity> holdOrderEntities = contractHoldOrderDao.selectHoldOrderListByMemberIdAndSymbol(memberEntity.getId(), symbolDto.getSymbol(), 1);
			List<ContractHoldOrderEntity> holdOrderEntities = contractHoldOrderDao.selectHoldOrderListByMemberIdAndSymbol(memberEntity.getId(), symbolDto.getSymbol(), symbolDto.getType());
			if (CollUtil.isEmpty(holdOrderEntities)) {
			return Result.fail("订单不存在");
			}
			@@ -846,6 +851,10 @@
			if (i > 0) {
			// 发送爆仓消息
			sendOrderBombMsg(holdOrderEntity.getId(), holdOrderEntity.getOpeningType(), forceClosingPrice, holdOrderEntity.getSymbol(), holdOrderEntity.getOperateNo(), holdOrderEntity.getMemberId());

			if (ContractOrderEntity.CONTRACTTYPE_DOCUMENTARY == holdOrderEntity.getContractType()) {
			followProducer.sendChangeFollowOrderBond(changeBondDto);
			}
			return Result.ok("调整成功");
			}
			return Result.fail("调整失败");
			@@ -859,7 +868,7 @@
			BigDecimal newPriceSymbol = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(symbol)));

			List<ContractEntrustOrderEntity> entrustOrderEntities = contractEntrustOrderDao.selectEntrustOrderListByMemberId(memberEntity.getId());
			List<ContractHoldOrderEntity> holdOrderEntities = contractHoldOrderDao.selectHoldOrderListByMemberIdAndSymbolTest(memberEntity.getId(), ContractOrderEntity.CONTRACTTYPE_NORMAL);
			List<ContractHoldOrderEntity> holdOrderEntities = contractHoldOrderDao.selectHoldOrderListByMemberIdAndSymbolTest(memberEntity.getId(), null);
			MemberWalletContractEntity walletContractEntity = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberEntity.getId(), CoinTypeEnum.USDT.name());
			// if (memberEntity.getContractPositionType().equals(ContractEntrustOrderEntity.POSITION_TYPE_ADD)) {
			// // 当前合约委托单
			@@ -1163,6 +1172,7 @@
			holdOrderEntity.setHoldAmount(holdAmount);
			contractHoldOrderDao.updateById(holdOrderEntity);
			memberWalletContractDao.increaseWalletContractBalanceById(thisTimeHold.negate(), thisTimeHold.negate(), null, wallet.getId());
			ThreadPoolUtils.sendWholePrice(holdOrderEntity.getMemberId());
			}
			}
			}