From 030e1d50c1f643137220f1ecf1d90ce39174204a Mon Sep 17 00:00:00 2001
From: dd <gitluke@outlook.com>
Date: Sat, 30 May 2026 01:58:54 +0800
Subject: [PATCH] 1
---
trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiContractApplyOrderController.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiContractApplyOrderController.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiContractApplyOrderController.java
index 11f9369..07e7bf5 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiContractApplyOrderController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiContractApplyOrderController.java
@@ -28,6 +28,7 @@
import com.yami.trading.service.contract.ContractApplyOrderService;
import com.yami.trading.service.contract.ContractLockService;
import com.yami.trading.service.contract.ContractOrderService;
+import com.yami.trading.service.contract.ContractPositionModeService;
import com.yami.trading.service.data.DataService;
import com.yami.trading.service.item.ItemLeverageService;
import com.yami.trading.service.item.ItemService;
@@ -94,6 +95,9 @@
private ContractOrderService contractOrderService;
@Autowired
+ private ContractPositionModeService contractPositionModeService;
+
+ @Autowired
private ContractLockService contractLockService;
@Autowired
private SessionTokenService sessionTokenService;
@@ -128,6 +132,7 @@
data.put("contract_open_limit_min", contractOpenLimitMin);
BigDecimal contractOpenLimitMax = new BigDecimal(sysparaService.find("contract_open_limit_max").getSvalue());
data.put("contract_open_limit_max", contractOpenLimitMax);
+ data.put("contract_position_mode", contractPositionModeService.getMode());
return Result.succeed(data);
@@ -264,7 +269,7 @@
private void checkUserStatus(String partyId) {
User user = userService.getById(partyId);
if (!user.isEnabled()) {
- throw new YamiShopBindException("用户已锁定");
+ throw new YamiShopBindException("User is locked");
}
}
@@ -299,7 +304,6 @@
order.setState(ContractApplyOrder.STATE_SUBMITTED);
order.setMoney(openAction.getAmount());
order.setLocationType(openAction.getLocationType());
-
contractApplyOrderService.saveCreate(order);
}
@@ -319,7 +323,7 @@
try {
User user = userService.getById(partyId);
if (!user.isEnabled()) {
- throw new YamiShopBindException("用户已锁定");
+ throw new YamiShopBindException("User is locked");
}
Syspara syspara = sysparaService.find("stop_user_internet");
@@ -339,7 +343,7 @@
order.setPartyId(partyId);
order.setSymbol(closeAction.getSymbol());
order.setDirection(closeAction.getDirection());
- order.setOffset(ContractApplyOrder.OFFSET_OPEN);
+ order.setOffset(ContractApplyOrder.OFFSET_CLOSE);
order.setVolume(closeAction.getAmount());
order.setVolumeOpen(closeAction.getAmount());
order.setPrice(closeAction.getPrice());
--
Gitblit v1.9.3