From a8e2dbcd82859a3f972192c60b95cba4defe1738 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Thu, 02 Apr 2026 14:10:01 +0800
Subject: [PATCH] 1
---
trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiContractApplyOrderController.java | 4 ++--
trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiItemUserOptionalController.java | 11 ++++++++---
2 files changed, 10 insertions(+), 5 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 19b3b69..a7bfd5d 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
@@ -240,14 +240,14 @@
throw new YamiShopBindException("无网络");
}
}
- List<Map<String, Object>> list = this.contractOrderService.findSubmittedRedis(partyId, openAction.getSymbol());
+ /*List<Map<String, Object>> list = this.contractOrderService.findSubmittedRedis(partyId, openAction.getSymbol());
if (ObjectUtils.isNotEmpty(list)) {
for (Map<String, Object> map :list) {
if(!openAction.getDirection().equals(map.get("direction"))) {
throw new YamiShopBindException("同一币种不允许多空双开");
}
}
- }
+ }*/
ContractApplyOrder order = new ContractApplyOrder();
order.setPartyId(partyId);
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiItemUserOptionalController.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiItemUserOptionalController.java
index 18568ef..89c0c5c 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiItemUserOptionalController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiItemUserOptionalController.java
@@ -40,9 +40,14 @@
@ApiOperation("返回用户自选币种的列表")
@GetMapping("/api/itemUserOptional!list.action")
public Result<List<ItemUserOptionalDTO>> list(@RequestParam(required = false) String symbol) {
- String partyId = SecurityUtils.getCurrentUserId();
- List<ItemUserOptionalDTO> models = itemUserOptionalService.getItemUserOptionals(symbol, partyId);
- return Result.ok(models);
+ try {
+ String partyId = SecurityUtils.getCurrentUserId();
+ List<ItemUserOptionalDTO> models = itemUserOptionalService.getItemUserOptionals(symbol, partyId);
+ return Result.ok(models);
+ }catch (Exception e){
+ log.error(e.getMessage());
+ return Result.ok(null);
+ }
}
--
Gitblit v1.9.3