From 640ccb9229224642515527daf87f308a7aa9bdf4 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 10 Jun 2026 11:47:26 +0800
Subject: [PATCH] 1

---
 trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiContractOrderController.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiContractOrderController.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiContractOrderController.java
index fed5803..e1f7ee9 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiContractOrderController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiContractOrderController.java
@@ -74,12 +74,12 @@
     public Result<String> addDepositOpen(@RequestParam @NotBlank String orderNo, @RequestParam @NotBlank BigDecimal addDepositOpen) {
         try {
             ContractOrder order = this.contractOrderService.findByOrderNo(orderNo);
-            if (order != null && order.getState().equals(ContractOrder.STATE_SUBMITTED)) {
+            if (order != null && order.getState().equals(ContractOrder.STATE_SUBMITTED) && order.getLocationType() == 0) {
                 contractOrderService.addDepositOpen(order, addDepositOpen);
             }
         } catch (Exception e) {
             log.error("追加保证金异常", e);
-            throw new YamiShopBindException("追加保证金异常");
+            throw new YamiShopBindException("Failed to add margin");
         }
         return Result.succeed("success");
     }
@@ -97,7 +97,7 @@
             }
         } catch (Exception e) {
             log.error("追加保证金异常", e);
-            throw new YamiShopBindException("追加保证金异常");
+            throw new YamiShopBindException("Failed to add margin");
         }
         return Result.succeed("success");
     }
@@ -215,7 +215,7 @@
 
         if (null == order) {
             log.info("contractOrder!get order_no:" + order_no + ", order null");
-            throw new YamiShopBindException("订单不存在");
+            throw new YamiShopBindException("Order does not exist");
         }
 
         return Result.ok(this.contractOrderService.bulidOne(order));
@@ -256,10 +256,10 @@
         }
 
         if (!StringUtils.isInteger(page_no)) {
-            throw new YamiShopBindException("页码不是整数");
+            throw new YamiShopBindException("Page number must be an integer");
         }
         if (Integer.valueOf(page_no).intValue() <= 0) {
-            throw new YamiShopBindException("页码不能小于等于0");
+            throw new YamiShopBindException("Page number must be greater than 0");
         }
         String partyId = SecurityUtils.getCurrentUserId();
 

--
Gitblit v1.9.3