From 14c1946eae86a86f8d1edee6cf3bdaf7572fc966 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 30 Oct 2025 19:44:38 +0800
Subject: [PATCH] 1
---
trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiContractApplyOrderController.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 6a317eb..c6c9b23 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
@@ -264,7 +264,7 @@
private void checkUserStatus(String partyId) {
User user = userService.getById(partyId);
if (!user.isEnabled()) {
- throw new YamiShopBindException("用户已锁定");
+ throw new YamiShopBindException("User is locked");
}
}
@@ -298,6 +298,7 @@
order.setOrderPriceType(openAction.getPrice_type());
order.setState(ContractApplyOrder.STATE_SUBMITTED);
order.setMoney(openAction.getAmount());
+ order.setLocationType(openAction.getLocationType());
contractApplyOrderService.saveCreate(order);
}
@@ -318,7 +319,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");
@@ -421,14 +422,14 @@
map.put("price", order.getPrice());
map.put("stop_price_profit", order.getStopPriceProfit());
if( order.getStopPriceLoss() !=null) {
- map.put("stop_price_loss", order.getStopPriceLoss().setScale(4, RoundingMode.HALF_UP));
+ map.put("stop_price_loss", order.getStopPriceLoss().setScale(4, RoundingMode.DOWN));
}else{
map.put("stop_price_loss", null);
}
map.put("price_type", order.getOrderPriceType());
map.put("state", order.getState());
- map.put("amount", order.getVolume().multiply(order.getUnitAmount()).setScale(4, RoundingMode.HALF_UP));
+ map.put("amount", order.getVolume().multiply(order.getUnitAmount()).setScale(4, RoundingMode.DOWN));
map.put("amount_open", order.getVolumeOpen().multiply(order.getUnitAmount()));
map.put("fee", order.getFee());
map.put("deposit", order.getDeposit());
@@ -605,9 +606,9 @@
Realtime realtime = realtimeMap.get(data.getSymbol());
BigDecimal mark_price = realtime.getClose();
if(data.getDirection().equalsIgnoreCase("buy")){
- expectedProfitAndLoss += data.getVolume().multiply(data.getLeverRate()).multiply(data.getUnitAmount()).multiply(mark_price.subtract(data.getPrice()).divide(data.getPrice(), 4, RoundingMode.HALF_UP)).doubleValue();
+ expectedProfitAndLoss += data.getVolume().multiply(data.getLeverRate()).multiply(data.getUnitAmount()).multiply(mark_price.subtract(data.getPrice()).divide(data.getPrice(), 4, RoundingMode.DOWN)).doubleValue();
}else{
- expectedProfitAndLoss -= data.getVolume().multiply(data.getLeverRate()).multiply(data.getUnitAmount()).multiply(mark_price.subtract(data.getPrice()).divide(data.getPrice(), 4, RoundingMode.HALF_UP)).doubleValue();
+ expectedProfitAndLoss -= data.getVolume().multiply(data.getLeverRate()).multiply(data.getUnitAmount()).multiply(mark_price.subtract(data.getPrice()).divide(data.getPrice(), 4, RoundingMode.DOWN)).doubleValue();
}
//手续费
double fee = Double.parseDouble(data.getFee().toString());
--
Gitblit v1.9.3