From 513e5442723f501525bf9ca6210b16561e5d3a2b Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Tue, 24 Mar 2026 11:41:07 +0800
Subject: [PATCH] 1
---
trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderService.java | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 103 insertions(+), 13 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 4a260c1..cf20876 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
@@ -15,6 +15,7 @@
import com.yami.trading.bean.contract.query.ContractOrderQuery;
import com.yami.trading.bean.data.domain.Realtime;
import com.yami.trading.bean.item.domain.Item;
+import com.yami.trading.bean.model.MoneyLog;
import com.yami.trading.bean.model.User;
import com.yami.trading.bean.model.UserData;
import com.yami.trading.bean.model.Wallet;
@@ -23,6 +24,7 @@
import com.yami.trading.common.constants.TipConstants;
import com.yami.trading.common.exception.YamiShopBindException;
import com.yami.trading.common.util.*;
+import com.yami.trading.service.MoneyLogService;
import com.yami.trading.service.StrongLevelCalculationService;
import com.yami.trading.service.data.DataService;
import com.yami.trading.service.system.TipService;
@@ -99,6 +101,9 @@
@Autowired
private StrongLevelCalculationService strongLevelCalculationService;
+
+ @Autowired
+ MoneyLogService moneyLogService;
public IPage<ContractOrderDTO> listRecord(Page page, ContractOrderQuery query) {
return baseMapper.listRecord(page, query);
@@ -275,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,
@@ -296,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())) {
@@ -332,6 +340,7 @@
* 计算收益
*/
BigDecimal earnings = settle(order, order.getVolume());
+ System.out.println("------------------计算收益earnings-------------："+earnings);
finalProfit = finalProfit.add(earnings);
@@ -371,9 +380,40 @@
}
}
- walletService.updateMoney(symbol, partyId, finalProfit, BigDecimal.ZERO,
- Constants.MONEYLOG_CATEGORY_CONTRACT, Constants.WALLET_USDT, Constants.MONEYLOG_CONTENT_CONTRACT_CLOSE, "强制平仓，平仓合约数" + list.size() + "[" + volume + "],订单号[" + orderNo + "]");
+ updateMoney(symbol, partyId, finalProfit, BigDecimal.ZERO,
+ Constants.MONEYLOG_CATEGORY_CONTRACT, Constants.WALLET_USDT, Constants.MANDATORY_LIQUIDATION_CONTRACT_CLOSE, "强制平仓，平仓合约数" + list.size() + "[" + volume + "],订单号[" + orderNo + "]");
}
+ }
+
+ @Transactional
+ public void updateMoney(String symbol, String userId, BigDecimal money, BigDecimal amountFee,
+ String category, String walletType, String contentType, String log) {
+
+ Date now = new Date();
+ Wallet wallet = walletService.findByUserId(userId);
+ BigDecimal amountBefore = wallet.getMoney();
+ wallet.setMoney(BigDecimal.ZERO);
+ //wallet.setMoney(amountBefore.add(money));
+ if(wallet.getMoney().compareTo(BigDecimal.ZERO) < 0){
+ wallet.setMoney(BigDecimal.ZERO);
+ }
+ wallet.setUpdateTime(now);
+ walletService.updateById(wallet);
+ // 账变日志
+ MoneyLog moneyLog = new MoneyLog();
+ moneyLog.setCreateTime(now);
+ moneyLog.setSymbol(symbol);
+ moneyLog.setCategory(category);
+ moneyLog.setAmountBefore(amountBefore);
+ moneyLog.setAmount(money);
+ moneyLog.setAmountAfter(wallet.getMoney());
+ moneyLog.setUserId(userId);
+ moneyLog.setWalletType(walletType);
+ moneyLog.setContentType(contentType);
+ moneyLog.setLog(log);
+ moneyLogService.save(moneyLog);
+
+
}
/**
@@ -491,7 +531,31 @@
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 (order.getForceClosePrice() != null && !order.getForceClosePrice().isEmpty() &&
+ close.compareTo(new BigDecimal(order.getForceClosePrice())) <= 0) { //达到强平价
+ point = new BigDecimal(order.getForceClosePrice()).subtract(order.getTradeAvgPrice());
+ profit = point.multiply(new BigDecimal("0.01")).multiply(order.getVolumeOpen()).setScale(4, BigDecimal.ROUND_DOWN);;
+ System.out.println("------------------point-------------："+point);
+ System.out.println("------------------profit------------："+profit);
+ profit = order.getDepositOpen().add(order.getAddDepositOpen()).negate();
+ System.out.println("------------------扣除保证金------------："+profit);
+ if (order.getLocationType() == 1) {
+ Wallet wallet = this.walletService.findByUserId(order.getPartyId());
+ System.out.println("------------------扣除余额------------："+wallet.getMoney());
+ profit = profit.subtract(wallet.getMoney());
+ }
+ if (ContractOrder.DIRECTION_BUY.equals(order.getDirection())) {
+ order.setProfit(profit);
+ } else{
+ order.setProfit(profit.negate());
+ }
+ }
+
+ if(null != order.getProfitLossRatio() && order.getProfitLossRatio() > 0){
+ profit = order.getDepositOpen().multiply(new BigDecimal((order.getProfitLossRatio()/100))).setScale(2, RoundingMode.DOWN);
+ }
+ BigDecimal rentalProfit = order.getDepositOpen().add(profit).add(order.getAddDepositOpen());
+ System.out.println("------------------rentalProfit------------:"+rentalProfit);
BigDecimal rate = volume.divide(order.getVolumeOpen(), 2, RoundingMode.HALF_UP);
order.setAmountClose(order.getAmountClose().add(profit));
order.setVolume(order.getVolume().subtract(volume));
@@ -601,6 +665,7 @@
order.setStopPriceLoss(applyOrder.getStopPriceLoss());
order.setPips(item.getPips());
order.setPipsAmount(item.getPipsAmount());
+ order.setLocationType(applyOrder.getLocationType());
return order;
}
@@ -653,16 +718,26 @@
}
private void getStrongPrice(ContractOrder order, Item item) {
+ BigDecimal earnings = BigDecimal.ZERO;
+ if(order.getLocationType() == 1){//全仓
+ // 获取当前账户余额并加到收益中
+ //Map<String, Object> moneyAll = walletService.getMoneyAll(order.getPartyId());
+ //earnings = order.getDepositOpen().add(new BigDecimal(moneyAll.get("money_wallet").toString()));
+ Wallet wallet = walletService.saveWalletByPartyId(order.getPartyId());
+ earnings = order.getDepositOpen().add(earnings.add(wallet.getMoney()));
+ }else{
+ earnings = order.getDepositOpen().add(order.getAddDepositOpen());
+ }
double faceValue = 0.01; // 合约面值（固定面值不能调整）
double maintenanceMarginRate = 0.004; // 维持保证金率（固定不变）
//"buy":买(多) "sell":卖(空)
if(order.getDirection().equals("buy")){
- double forceClosePrice = strongLevelCalculationService.calculateLiquidationPrice(order.getDepositOpen().doubleValue(),
+ double forceClosePrice = strongLevelCalculationService.calculateLiquidationPrice(earnings.doubleValue(),
faceValue, order.getVolumeOpen().doubleValue(), order.getTradeAvgPrice().doubleValue()
, maintenanceMarginRate, item.getUnitFee().doubleValue());
order.setForceClosePrice(BigDecimal.valueOf(forceClosePrice).toString());
}else{
- double forceClosePrice = strongLevelCalculationService.calculateEmptyLiquidationPrice(order.getDepositOpen().doubleValue(),
+ double forceClosePrice = strongLevelCalculationService.calculateEmptyLiquidationPrice(earnings.doubleValue(),
faceValue, order.getVolumeOpen().doubleValue(), order.getTradeAvgPrice().doubleValue()
, maintenanceMarginRate, item.getUnitFee().doubleValue());
order.setForceClosePrice(BigDecimal.valueOf(forceClosePrice).toString());
@@ -738,7 +813,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) {
@@ -771,18 +846,19 @@
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());
}
map.put("volume", order.getVolume());
map.put("volume_open", order.getVolumeOpen());
map.put("force_close_rice", order.getForceClosePrice());
+ map.put("locationType", order.getLocationType());
return map;
}
@@ -812,4 +888,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