From 604341da0cfe8f40cdf549fe9ad145f0d443a718 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Tue, 27 Aug 2024 22:38:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jys7-15' into jys7-15
---
src/main/java/project/contract/job/ContractOrderCalculationServiceImpl.java | 94 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 91 insertions(+), 3 deletions(-)
diff --git a/src/main/java/project/contract/job/ContractOrderCalculationServiceImpl.java b/src/main/java/project/contract/job/ContractOrderCalculationServiceImpl.java
index a423405..1fc7433 100644
--- a/src/main/java/project/contract/job/ContractOrderCalculationServiceImpl.java
+++ b/src/main/java/project/contract/job/ContractOrderCalculationServiceImpl.java
@@ -2,26 +2,42 @@
import java.text.DecimalFormat;
import java.util.List;
+import java.util.Map;
+import kernel.util.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import kernel.util.Arith;
import kernel.util.ThreadUtils;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.util.ObjectUtils;
import project.contract.ContractLock;
import project.contract.ContractOrder;
import project.contract.ContractOrderService;
+import project.contract.ContractRedisKeys;
import project.data.DataService;
import project.data.model.Realtime;
+import project.redis.RedisHandler;
import project.syspara.SysparaService;
+import project.wallet.AssetService;
import project.wallet.Wallet;
+import project.wallet.WalletRedisKeys;
import project.wallet.WalletService;
+import project.wallet.consumer.WalletMessage;
-public class ContractOrderCalculationServiceImpl implements ContractOrderCalculationService {
+public class ContractOrderCalculationServiceImpl implements ContractOrderCalculationService, ApplicationContextAware {
+ private ApplicationContext applicationContext;
+
private static final Logger logger = LoggerFactory.getLogger(ContractOrderCalculationServiceImpl.class);
private ContractOrderService contractOrderService;
private DataService dataService;
private WalletService walletService;
+// private RedisHandler redisHandler;
+ private AssetService assetService;
public final static String STATE_SUBMITTED = "submitted";
public final static String STATE_CREATED = "created";
/**
@@ -95,13 +111,58 @@
double amount = Arith.mul(div, Arith.sub(currentPrice, order.getTrade_avg_price()));
logger.info("---------盈亏金额："+amount);
logger.info("---------盈亏："+profit_loss);
+ RedisHandler redisHandler = getRedisHandler();
if ("profit".equals(profit_loss)) {
/**
* 盈 正数
*/
order.setProfit(Arith.add(0.0D, Math.abs(amount)));
+
+ Object profit = redisHandler.get("MONEY_CONTRACT_PROFIT_" + order.getPartyId().toString());
+ if(!ObjectUtils.isEmpty(profit)){
+ if(Double.parseDouble(profit.toString()) < 0 ){
+
+ redisHandler.setSync("MONEY_CONTRACT_PROFIT_"+order.getPartyId().toString(), 0);
+
+ Object money = redisHandler.get("PARTY_ID_MONEY_" + order.getPartyId().toString());
+ if(!ObjectUtils.isEmpty(money)){
+ Wallet wallet = this.walletService.saveWalletByPartyId(order.getPartyId().toString());
+ wallet.setMoney(Double.parseDouble(money.toString()));
+ redisHandler.setSync(WalletRedisKeys.WALLET_PARTY_ID + wallet.getPartyId().toString(), wallet);
+ redisHandler.pushAsyn(WalletRedisKeys.WALLET_QUEUE_UPDATE, new WalletMessage(order.getPartyId().toString(), amount));
+ }
+ }
+ }
} else if ("loss".equals(profit_loss)) {
order.setProfit(Arith.sub(0.0D,Math.abs(amount) ));
+
+ //定义一个 总浮动亏损的值
+ Double contractAssetsProfit = (Double) redisHandler.get(ContractRedisKeys.CONTRACT_ASSETS_PROFIT_PARTY_ID + order.getPartyId().toString());
+ double contractProfit = null == contractAssetsProfit ? 0.000D : contractAssetsProfit;
+ List<ContractOrder> list = contractOrderService.findSubmitted(order.getPartyId().toString(), null, null);
+ double deposit = 0;
+ for (int i = 0; i < list.size(); i++) {
+ ContractOrder close_line = list.get(i);
+ deposit = Arith.add(deposit, close_line.getDeposit());
+ }
+ double profitt = Arith.add(contractProfit,deposit);
+ if(profitt <= 0){
+ redisHandler.setSync("MONEY_CONTRACT_PROFIT_"+order.getPartyId().toString(), profitt);
+ }else{
+ redisHandler.setSync("MONEY_CONTRACT_PROFIT_"+order.getPartyId().toString(), 0);
+ }
+ //修改余额,每次修改取平仓前余额减去浮动亏损
+ Wallet wallet = this.walletService.saveWalletByPartyId(order.getPartyId().toString());
+ Object money = redisHandler.get("PARTY_ID_MONEY_" + order.getPartyId().toString());
+ Object profit = redisHandler.get("MONEY_CONTRACT_PROFIT_" + order.getPartyId().toString());
+ if(!ObjectUtils.isEmpty(money) && !ObjectUtils.isEmpty(profit)){
+ double residueMoney = Arith.add(Double.parseDouble(money.toString()), Double.parseDouble(profit.toString()));
+ //如果当前余额减去浮动亏损小于0,将进入强平，这里不再进行余额更新
+ if(residueMoney > 0){
+ wallet.setMoney(residueMoney);
+ redisHandler.setSync(WalletRedisKeys.WALLET_PARTY_ID + wallet.getPartyId().toString(), wallet);
+ }
+ }
}
double changeRatio;
@@ -161,6 +222,7 @@
return;
}
}
+ logger.info("order_close_line_type:"+order_close_line_type);
if (order_close_line_type == 1) {
/**
* 收益
@@ -173,8 +235,15 @@
profit = Arith.add(profit, Arith.add(close_line.getProfit(), close_line.getDeposit()));
}
Wallet wallet = this.walletService.saveWalletByPartyId(order.getPartyId().toString());
- double totleMoney = wallet.getMoney();
+ Object money = redisHandler.get("PARTY_ID_MONEY_" + order.getPartyId().toString());
+ double totleMoney = 0;
+ if(ObjectUtils.isEmpty(money)){
+ totleMoney = wallet.getMoney();
+ }else{
+ totleMoney = Double.parseDouble(money.toString());
+ }
if (Arith.add(profit,totleMoney) <= 0) {
+ redisHandler.setSync("MONEY_CONTRACT_PROFIT_"+order.getPartyId().toString(), 0);
/**
* 触发全仓强平
*/
@@ -210,15 +279,19 @@
}
} else {
+ logger.info("---------进入单个持仓----------------");
+ logger.info("---------order.getProfit()----------------"+order.getProfit());
+ logger.info("---------order.getDeposit()----------------"+order.getDeposit());
+ logger.info("---------order_close_line----------------"+order_close_line);
if (order.getProfit() < 0 && (Arith.div(order.getDeposit(), Math.abs(order.getProfit())) <= Arith
.div(order_close_line, 100))) {
+ logger.info("---------进入强平了----------------");
/**
* 低于系统默认平仓线，进行强平
*/
this.contractOrderService.saveClose(order.getPartyId().toString(), order.getOrder_no());
return;
}
-
}
}
@@ -246,4 +319,19 @@
this.order_close_line_type = order_close_line_type;
}
+ public RedisHandler getRedisHandler() {
+ return applicationContext.getBean(RedisHandler.class);
+ }
+
+
+ public void setAssetService(AssetService assetService) {
+ this.assetService = assetService;
+ }
+
+
+ @Override
+ public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+ this.applicationContext = applicationContext;
+ }
+
}
--
Gitblit v1.9.3