exchange.git - Gitblit

			@@ -457,7 +457,7 @@
			tryGenerateQueues();
			}else {
			shortPositionSize = size.abs();
			//取消多仓位线以上的开空仓挂单
			//取消空仓仓位线以下的开多仓挂单
			List<GridElement> allLongOrders = GridElement.findAllLongOrders(shortEntryPrice);
			if (CollUtil.isNotEmpty(allLongOrders)){
			for (GridElement e : allLongOrders) {
			@@ -635,6 +635,88 @@
			}
			log.info("[Gate] 条件单状态变更, id:{}, status:{}, reason:{}, order_type:{}",
			orderId, status, reason, orderType);
			if (!"finished".equals(status)) {
			return;
			}

			/**
			* 匹配止盈单止盈
			*/
			GridElement byLongTakeProfitOrderId = GridElement.findByLongTakeProfitOrderId(orderId);
			if (byLongTakeProfitOrderId != null){
			longTakeProfitTraderIdParam(
			byLongTakeProfitOrderId,
			null,
			false
			);
			longEntryTraderIdParam(
			byLongTakeProfitOrderId,
			null,
			false
			);
			}
			GridElement byShortTakeProfitOrderId = GridElement.findByShortTakeProfitOrderId(orderId);
			if (byShortTakeProfitOrderId != null){
			shortTakeProfitTraderIdParam(
			byShortTakeProfitOrderId,
			null,
			false
			);
			shortEntryTraderIdParam(
			byShortTakeProfitOrderId,
			null,
			false
			);
			}

			/**
			* 匹配挂单
			*/
			GridElement longGridElement = GridElement.findByLongOrderId(orderId);
			if (longGridElement != null) {
			if (longGridElement.isHasLongOrder()){
			if (longGridElement.getLongTakeProfitOrderId() == null){
			BigDecimal longTp = longGridElement.getLongTraderParam().getTakeProfitPrice();
			if (longTp != null) {
			executor.placeTakeProfit(longTp,
			FuturesPriceTrigger.RuleEnum.NUMBER_1,
			ORDER_TYPE_CLOSE_LONG,
			negate(config.getQuantity()),
			(profitId) -> {
			longTakeProfitTraderIdParam(
			longGridElement,
			profitId,
			true
			);
			});
			log.info("[Gate] 多单成交匹配止盈, orderId:{}, 止盈价:{}, size:{}", orderId, longTp, negate(config.getQuantity()));
			return;
			}
			}
			}
			}
			GridElement shortGridElement = GridElement.findByShortOrderId(orderId);
			if (shortGridElement != null) {
			if (shortGridElement.isHasShortOrder()){
			if (shortGridElement.getShortTakeProfitOrderId() == null){
			BigDecimal shortTp = shortGridElement.getShortTraderParam().getTakeProfitPrice();
			if (shortTp != null) {
			executor.placeTakeProfit(shortTp,
			FuturesPriceTrigger.RuleEnum.NUMBER_2,
			ORDER_TYPE_CLOSE_SHORT,
			config.getQuantity(),
			(profitId) -> {
			shortTakeProfitTraderIdParam(
			shortGridElement,
			profitId,
			true
			);
			});
			log.info("[Gate] 空单成交匹配止盈, orderId:{}, 止盈价:{}, size:{}", orderId, shortTp, config.getQuantity());
			}
			}
			}
			}
			}

			// ---- 网格队列处理 ----
			@@ -936,30 +1018,6 @@
			log.info("[Gate] 网格元素列表已构建, 共{}个元素 (空仓:{} 位置:0 多仓:{})", elements.size(), shortSize, longSize);
			}

			/**
			* 空仓网格处理（当前价跌破空仓队列元素）。
			*
			* <h3>匹配规则</h3>
			* 遍历空仓队列（降序排列，大→小），收集所有大于当前价的元素为 matched。
			* 降序排列保证一旦遇到 price ≤ currentPrice 即可停止遍历。
			*
			* <h3>执行流程</h3>
			* <ol>
			* <li>匹配队列元素 → 为空则直接返回，不触发</li>
			* <li>空仓队列：移除 matched 元素，从尾部递减 step 补充等量新元素，重新降序排序</li>
			* <li>多仓队列：<b>不再更新</b>（队列转移逻辑已移除）</li>
			* <li>保证金检查 → 不安全则跳过挂单（队列照常更新），安全则继续</li>
			* <li>挂新空仓条件单（触发价 = newShortFirst，rule=NUMBER_2，止盈 = newShortFirst − step，
			* orderId → 止盈价存入 currentShortOrderIds）</li>
			* <li>多仓条件单守卫：newLongFirst = newShortFirst + step × 2，
			* 若 newLongFirst < longEntryPrice → 挂多仓条件单（止盈 = newLongFirst + step，
			* orderId → 止盈价存入 currentLongOrderIds）</li>
			* </ol>
			* 条件单成交后由 {@link #onOrderUpdate} 匹配止盈价并挂止盈条件单。
			* 反向条件单不再在此处理，改为在 {@link #onPositionUpdate} 仓位净减少时触发。
			*
			* @param currentPrice 当前 K 线收盘价（最新成交价）
			*/
			private void processShortGrid(BigDecimal currentPrice) {
			int prec = config.getPriceScale();
			List<BigDecimal> matched = new ArrayList<>();
			@@ -1038,86 +1096,60 @@
			null
			);
			}
			}
			int i = UpGridElement.getId() + 2;
			GridElement downGridElement = GridElement.findById(i);
			if (downGridElement != null){

			BigDecimal downGridPrice = downGridElement.getGridPrice();

			TraderParam downShortTraderParam = downGridElement.getShortTraderParam();
			if (
			!downGridElement.isHasShortOrder() &&
			downGridPrice.compareTo(longEntryPrice) <= 0 &&
			downGridPrice.compareTo(shortEntryPrice) >= 0
			){
			executor.placeConditionalEntryOrder(
			downShortTraderParam.getEntryPrice(),
			FuturesPriceTrigger.RuleEnum.NUMBER_2,
			negate(downShortTraderParam.getQuantity()),
			orderId ->
			{
			shortEntryTraderIdParam(
			downGridElement,
			orderId,
			true
			);
			},
			null
			);

			int i = UpGridElement.getId() + 2;
			GridElement downGridElement = GridElement.findById(i);
			if (downGridElement != null){
			}

			TraderParam downLongTraderParam = downGridElement.getLongTraderParam();
			if (!downGridElement.isHasLongOrder()){
			executor.placeConditionalEntryOrder(
			downLongTraderParam.getEntryPrice(),
			FuturesPriceTrigger.RuleEnum.NUMBER_1,
			downLongTraderParam.getQuantity(),
			orderId ->
			{
			longEntryTraderIdParam(
			downGridElement,
			orderId,
			true
			);
			},
			null
			);
			}

			TraderParam downShortTraderParam = downGridElement.getShortTraderParam();
			BigDecimal downGridPrice = downGridElement.getGridPrice();
			if (
			!downGridElement.isHasShortOrder() &&
			downGridPrice.compareTo(currentPrice) < 0 &&
			downGridPrice.compareTo(longEntryPrice) <= 0 &&
			downGridPrice.compareTo(shortEntryPrice) >= 0
			){
			executor.placeConditionalEntryOrder(
			downShortTraderParam.getEntryPrice(),
			FuturesPriceTrigger.RuleEnum.NUMBER_2,
			negate(downShortTraderParam.getQuantity()),
			orderId ->
			{
			shortEntryTraderIdParam(
			downGridElement,
			orderId,
			true
			);
			},
			null
			);

			TraderParam downLongTraderParam = downGridElement.getLongTraderParam();
			if (
			!downGridElement.isHasLongOrder() &&
			downGridPrice.compareTo(longEntryPrice) <= 0
			){
			executor.placeConditionalEntryOrder(
			downLongTraderParam.getEntryPrice(),
			FuturesPriceTrigger.RuleEnum.NUMBER_1,
			downLongTraderParam.getQuantity(),
			orderId ->
			{
			longEntryTraderIdParam(
			downGridElement,
			orderId,
			true
			);
			},
			null
			);
			}
			}
			}

			}

			}

			/**
			* 多仓网格处理（当前价涨破多仓队列元素）。
			*
			* <h3>匹配规则</h3>
			* 遍历多仓队列（升序排列，小→大），收集所有小于当前价的元素为 matched。
			* 升序排列保证一旦遇到 price ≥ currentPrice 即可停止遍历。
			*
			* <h3>执行流程</h3>
			* <ol>
			* <li>匹配队列元素 → 为空则直接返回，不触发</li>
			* <li>多仓队列：移除 matched 元素，从尾部递增 step 补充等量新元素，重新升序排序</li>
			* <li>空仓队列：<b>不再更新</b>（队列转移逻辑已移除）</li>
			* <li>保证金检查 → 不安全则跳过挂单（队列照常更新），安全则继续</li>
			* <li>挂新多仓条件单（触发价 = newLongFirst，rule=NUMBER_1，止盈 = newLongFirst + step，
			* orderId → 止盈价存入 currentLongOrderIds）</li>
			* <li>空仓条件单守卫：newShortFirst = newLongFirst − step × 2，
			* 若 newShortFirst > shortEntryPrice → 挂空仓条件单（止盈 = newShortFirst − step，
			* orderId → 止盈价存入 currentShortOrderIds）</li>
			* </ol>
			* 条件单成交后由 {@link #onOrderUpdate} 匹配止盈价并挂止盈条件单。
			* 反向条件单不再在此处理，改为在 {@link #onPositionUpdate} 仓位净减少时触发。
			*
			* @param currentPrice 当前 K 线收盘价（最新成交价）
			*/
			private void processLongGrid(BigDecimal currentPrice) {
			int prec = config.getPriceScale();
			List<BigDecimal> matched = new ArrayList<>();
			@@ -1200,60 +1232,60 @@
			null
			);
			}
			}

			int i = UpGridElement.getId() - 2;
			GridElement downGridElement = GridElement.findById(i);
			if (downGridElement != null){

			BigDecimal downGridPrice = downGridElement.getGridPrice();

			int i = UpGridElement.getId() - 2;
			GridElement downGridElement = GridElement.findById(i);
			if (downGridElement != null){
			TraderParam downLongTraderParam = downGridElement.getLongTraderParam();
			if (
			!downGridElement.isHasLongOrder() &&
			downGridPrice.compareTo(shortEntryPrice) >= 0 &&
			downGridPrice.compareTo(longEntryPrice) <= 0
			){
			executor.placeConditionalEntryOrder(
			downLongTraderParam.getEntryPrice(),
			FuturesPriceTrigger.RuleEnum.NUMBER_1,
			config.getQuantity(),
			orderId ->
			{
			longEntryTraderIdParam(
			downGridElement,
			orderId,
			true
			);
			},
			null
			);

			TraderParam shortTraderParam = downGridElement.getShortTraderParam();
			if (!downGridElement.isHasShortOrder()){
			executor.placeConditionalEntryOrder(
			shortTraderParam.getEntryPrice(),
			FuturesPriceTrigger.RuleEnum.NUMBER_2,
			negate(config.getQuantity()),
			orderId ->
			{
			shortEntryTraderIdParam(
			downGridElement,
			orderId,
			true
			);
			},
			null
			);
			}
			}

			TraderParam downLongTraderParam = downGridElement.getLongTraderParam();
			BigDecimal downGridPrice = downGridElement.getGridPrice();
			if (
			!downGridElement.isHasLongOrder() &&
			downGridPrice.compareTo(currentPrice) > 0 &&
			downGridPrice.compareTo(longEntryPrice) <= 0 &&
			downGridPrice.compareTo(shortEntryPrice) >= 0
			){
			executor.placeConditionalEntryOrder(
			downLongTraderParam.getEntryPrice(),
			FuturesPriceTrigger.RuleEnum.NUMBER_1,
			config.getQuantity(),
			orderId ->
			{
			longEntryTraderIdParam(
			downGridElement,
			orderId,
			true
			);
			},
			null
			);
			TraderParam shortTraderParam = downGridElement.getShortTraderParam();
			if (
			!downGridElement.isHasShortOrder() &&
			downGridPrice.compareTo(shortEntryPrice) >= 0
			){

			executor.placeConditionalEntryOrder(
			shortTraderParam.getEntryPrice(),
			FuturesPriceTrigger.RuleEnum.NUMBER_2,
			negate(config.getQuantity()),
			orderId ->
			{
			shortEntryTraderIdParam(
			downGridElement,
			orderId,
			true
			);
			},
			null
			);
			}
			}
			}

			}

			}

			// ---- 保证金安全阀 ----