From b865e7f64ad0a1edf9b795c0e66a1ba13b0d6aca Mon Sep 17 00:00:00 2001
From: peter <14100000001@qq.com>
Date: Sat, 06 Sep 2025 14:20:40 +0800
Subject: [PATCH] BUG
---
trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiContractApplyOrderController.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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..ff92be0 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
@@ -110,6 +110,19 @@
data.put("fee", item.getUnitFee());
List<ItemLeverageDTO> lLeverageDTO = itemLeverageService.findByItemId(item.getUuid());
+ // 对list进行排序，按照lever_rate字段升序排列
+ Collections.sort(lLeverageDTO, new Comparator<ItemLeverageDTO>() {
+ @Override
+ public int compare(ItemLeverageDTO o1, ItemLeverageDTO o2) {
+ try {
+ Double rate1 = Double.valueOf(o1.getLeverRate());
+ Double rate2 = Double.valueOf(o2.getLeverRate());
+ return rate1.compareTo(rate2);
+ } catch (NumberFormatException e) {
+ return 0;
+ }
+ }
+ });
data.put("lever", lLeverageDTO);
String partyId = SecurityUtils.getCurrentUserId();
@@ -264,7 +277,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 +311,7 @@
order.setOrderPriceType(openAction.getPrice_type());
order.setState(ContractApplyOrder.STATE_SUBMITTED);
order.setMoney(openAction.getAmount());
+ order.setLocationType(openAction.getLocationType());
contractApplyOrderService.saveCreate(order);
}
@@ -318,7 +332,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");
--
Gitblit v1.9.3