From d394ddc22071d72e9df7ac7d40772a704151edb7 Mon Sep 17 00:00:00 2001
From: zyy3 <zyy3@zy.com>
Date: Mon, 02 Mar 2026 21:47:09 +0800
Subject: [PATCH] 1
---
trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiContractOrderController.java | 2 +-
trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderService.java | 5 +++--
trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiContractApplyOrderController.java | 3 +--
3 files changed, 5 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 23c1eed..d05f720 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
@@ -298,8 +298,7 @@
order.setOrderPriceType(openAction.getPrice_type());
order.setState(ContractApplyOrder.STATE_SUBMITTED);
order.setMoney(openAction.getAmount());
- //order.setLocationType(openAction.getLocationType());
- order.setLocationType(0);
+ order.setLocationType(openAction.getLocationType());
contractApplyOrderService.saveCreate(order);
}
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..65c5b1f 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,7 +74,7 @@
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) {
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderService.java b/trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderService.java
index e556149..d11bea5 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderService.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderService.java
@@ -281,10 +281,11 @@
Wallet wallet = walletService.findByUserId(order.getPartyId());
if (wallet.getMoney().add(profit).compareTo(BigDecimal.ZERO) < 0) {
- // 如果结果是负数，就归零
+ /*// 如果结果是负数，就归零
if (wallet.getMoney().compareTo(BigDecimal.ZERO) < 0) {
profit = BigDecimal.ZERO;
- }
+ }*/
+ profit = wallet.getMoney().negate();
}
walletService.updateMoney(order.getSymbol(), partyId, profit, BigDecimal.ZERO,
--
Gitblit v1.9.3