From b28a97e1bf66e3279e78f31ce58122427787ceec Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 11 Jun 2026 09:44:20 +0800
Subject: [PATCH] 1
---
trading-order-service/src/main/java/com/yami/trading/service/exchange/impl/ExchangeApplyOrderServiceImpl.java | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/exchange/impl/ExchangeApplyOrderServiceImpl.java b/trading-order-service/src/main/java/com/yami/trading/service/exchange/impl/ExchangeApplyOrderServiceImpl.java
index 00ea947..147bc42 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/exchange/impl/ExchangeApplyOrderServiceImpl.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/exchange/impl/ExchangeApplyOrderServiceImpl.java
@@ -142,12 +142,17 @@
boolean order_open = sysparaService.find("exchange_order_open").getBoolean();
if (!order_open) {
- throw new YamiShopBindException("不在交易时段");
+ throw new YamiShopBindException("Outside trading hours");
}
Item item = itemService.findBySymbol(order.getSymbol());
if (item == null) {
- throw new YamiShopBindException("参数错误");
+ throw new YamiShopBindException("Invalid parameters");
}
+ /*if (itemService.isSuspended(order.getSymbol())) {
+ throw new YamiShopBindException("Trading suspended");
+ }*/
+
+
List<Realtime> realtimes = dataService.realtime(order.getSymbol());
double close = 1;
if (realtimes != null && realtimes.size() > 0) {
@@ -337,8 +342,10 @@
// 如果是计划委托则不返回余额
if (order.isTriggerOrder()) {
if (ExchangeApplyOrder.OFFSET_OPEN.equals(order.getOffset())) {
- Wallet wallet = this.walletService.saveWalletByPartyId(order.getPartyId());
- double amount_before = wallet.getMoney().doubleValue();
+ //Wallet wallet = this.walletService.saveWalletByPartyId(order.getPartyId());
+ //double amount_before = wallet.getMoney().doubleValue();
+ CapitaltWallet userIdWallet = capitaltWalletService.getUserIdWallet(order.getPartyId());
+ double amount_before = userIdWallet.getMoney().doubleValue();
MoneyLog moneylog = new MoneyLog();
moneylog.setCategory(Constants.MONEYLOG_CATEGORY_EXCHANGE);
moneylog.setAmountBefore(new BigDecimal(amount_before));
@@ -373,16 +380,20 @@
}
if (!order.isTriggerOrder()) {
if (ExchangeApplyOrder.OFFSET_OPEN.equals(order.getOffset())) {
- Wallet wallet = this.walletService.saveWalletByPartyId(order.getPartyId());
- double amount_before = wallet.getMoney().doubleValue();
+ //Wallet wallet = this.walletService.saveWalletByPartyId(order.getPartyId());
+ //double amount_before = wallet.getMoney().doubleValue();
// wallet.setMoney(Arith.add(wallet.getMoney(), order.getVolume()));
// walletService.update(wallet);
- walletService.update(wallet.getUserId().toString(), order.getVolume());
+ //walletService.update(wallet.getUserId().toString(), order.getVolume());
+ CapitaltWallet userIdWallet = capitaltWalletService.getUserIdWallet(order.getPartyId());
+ double amount_before = userIdWallet.getMoney().doubleValue();
+ capitaltWalletService.update(userIdWallet, order.getVolume());
+
MoneyLog moneylog = new MoneyLog();
moneylog.setCategory(Constants.MONEYLOG_CATEGORY_EXCHANGE);
moneylog.setAmountBefore(new BigDecimal(amount_before));
moneylog.setAmount(new BigDecimal(order.getVolume()));
- moneylog.setAmount_after(wallet.getMoney());
+ moneylog.setAmountAfter(userIdWallet.getMoney());
moneylog.setLog("币币交易撤单，订单号[" + order.getOrderNo() + "]");
moneylog.setUserId(order.getPartyId());
moneylog.setWalletType(Constants.WALLET);
@@ -525,12 +536,14 @@
}
for (ExchangeRecord entry : recordMap.values()) {
Map<String, Object> map = new HashMap<String, Object>();
- map.put("symbol", entry.getSymbol());
+ //map.put("symbol", entry.getSymbol());
+ map.put("symbol", entry.getSymbol().equalsIgnoreCase("galausdt") ? "dxcmusdt" : entry.getSymbol());
Item bySymbol = itemService.findBySymbol(entry.getSymbol());
if (bySymbol != null) {
map.put("symbol_data", bySymbol.getSymbolData());
}
- map.put("symbol_to", entry.getSymbol_to());
+ map.put("symbol_to", entry.getSymbol_to().equalsIgnoreCase("galausdt") ? "dxcmusdt" : entry.getSymbol_to());
+ //map.put("symbol_to", entry.getSymbol_to());
map.put("amount", entry.getAmount());
map.put("amount_to", entry.getAmount_to());
map.put("create_time", entry.getCreate_time());
@@ -641,7 +654,7 @@
System.out.println("-----userIdWallet---------:"+userIdWallet.getMoney().doubleValue());
System.out.println("-----order---------:"+order.getVolume().doubleValue());
if (userIdWallet.getMoney().doubleValue() < order.getVolume().doubleValue()) {
- throw new YamiShopBindException("余额不足");
+ throw new YamiShopBindException("Insufficient balance");
}
// this.walletService.update(userIdWallet.getUserId().toString(), Arith.sub(0, order.getVolume()));
capitaltWalletService.update(userIdWallet, Arith.sub(0, order.getVolume()));
@@ -698,7 +711,7 @@
}
if (!order.isTriggerOrder()) {
if (order.getVolume() > walletExtend.getAmount()) {
- throw new YamiShopBindException("仓位不足");
+ throw new YamiShopBindException("Insufficient position");
}
walletService.updateExtend(walletExtend.getPartyId().toString(), walletExtend.getWallettype(),
Arith.sub(0, order.getVolume()));
--
Gitblit v1.9.3