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-service/src/main/java/com/yami/trading/service/contract/ContractOrderService.java | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 deletions(-)
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 2c6b24e..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
@@ -280,12 +280,12 @@
BigDecimal profit = settle(order, order.getVolume());
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,
@@ -301,6 +301,9 @@
* 合约产品平仓后添加当前流水setWithdraw_limit_now_amount
*/
User party = userService.getById(order.getPartyId());
+ if (party.getWithdrawLimitNowAmount() == null) {
+ party.setWithdrawLimitNowAmount(BigDecimal.ZERO);
+ }
party.setWithdrawLimitNowAmount(party.getWithdrawLimitNowAmount().add(order.getDepositOpen()));
userService.updateById(party);
if (ObjectUtils.isEmpty(order.getCloseAvgPrice())) {
@@ -526,7 +529,10 @@
BigDecimal close = realtime.getClose();
BigDecimal point = close.subtract(order.getTradeAvgPrice());
BigDecimal profit = point.multiply(new BigDecimal("0.01")).multiply(order.getVolumeOpen()).setScale(4, BigDecimal.ROUND_DOWN);;
- BigDecimal rentalProfit = order.getDeposit().add(profit);
+ if(null != order.getProfitLossRatio() && order.getProfitLossRatio() > 0){
+ profit = order.getDepositOpen().multiply(new BigDecimal((order.getProfitLossRatio()/100))).setScale(2, RoundingMode.DOWN);
+ }
+ BigDecimal rentalProfit = order.getDeposit().add(profit).add(order.getAddDepositOpen());
BigDecimal rate = volume.divide(order.getVolumeOpen(), 2, RoundingMode.HALF_UP);
order.setAmountClose(order.getAmountClose().add(profit));
order.setVolume(order.getVolume().subtract(volume));
@@ -695,7 +701,7 @@
Map<String, Object> moneyAll = walletService.getMoneyAll(order.getPartyId());
earnings = order.getDepositOpen().add(new BigDecimal(moneyAll.get("money_all_coin").toString()));
}else{
- earnings = order.getDepositOpen();
+ earnings = order.getDepositOpen().add(order.getAddDepositOpen());
}
double faceValue = 0.01; // 合约面值（固定面值不能调整）
double maintenanceMarginRate = 0.004; // 维持保证金率（固定不变）
@@ -782,7 +788,7 @@
}
map.put("name", name);
map.put("symbol", order.getSymbol());
- map.put("create_time", DateUtils.format(order.getCreateTime(), DateUtils.DF_yyyyMMddHHmmss));
+ map.put("create_time", order.getCreateTime());
map.put("create_time_ts", order.getCreateTimeTs());
if (order.getCloseTime() != null) {
@@ -815,12 +821,12 @@
map.put("amount", order.getVolume().multiply(order.getUnitAmount()));
map.put("amount_open", order.getVolumeOpen().multiply(order.getUnitAmount()));
map.put("fee", order.getFee());
- map.put("deposit", order.getDeposit());
- map.put("deposit_open", order.getDepositOpen());
- map.put("change_ratio", order.getChangeRatio());
+ map.put("deposit", order.getDeposit().add(order.getAddDepositOpen()));
+ map.put("deposit_open", order.getDepositOpen().add(order.getAddDepositOpen()));
+ map.put("change_ratio", order.getChangeRatio().setScale(2, RoundingMode.HALF_UP));
if(order.getProfit()!=null){
- map.put("profit", order.getProfit().setScale(4, RoundingMode.HALF_UP));
+ map.put("profit", order.getProfit().setScale(2, RoundingMode.HALF_UP));
}else{
map.put("profit", order.getProfit());
}
@@ -857,4 +863,18 @@
RedisUtil.del(ContractRedisKeys.CONTRACT_ASSETS_PROFIT_PARTY_ID + partyId);
}
}
+
+
+ public void addDepositOpen(ContractOrder order, BigDecimal addDepositOpen) {
+ Wallet wallet = walletService.findByUserId(order.getPartyId());
+ BigDecimal amountBefore = wallet.getMoney();
+ if (amountBefore.compareTo(addDepositOpen) < 0) {
+ throw new YamiShopBindException("not sufficient funds");
+ }
+ order.setAddDepositOpen(order.getAddDepositOpen().add(addDepositOpen));
+ walletService.updateMoney(order.getSymbol(), order.getPartyId(), BigDecimal.ZERO.subtract(addDepositOpen), BigDecimal.ZERO
+ , Constants.MONEYLOG_CATEGORY_CONTRACT, Constants.WALLET_USDT, Constants.MONEYLOG_CONTENT_CONTRACT_ADD, "委托单追加保证金，订单号[" + order.getOrderNo() + "]"
+ );
+ update(order);
+ }
}
--
Gitblit v1.9.3