From cf3fbd17f3eaa432b38b637fe08534e80c06fc95 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 29 Jun 2020 16:55:39 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java | 105 +++++++++++++++++++++++++++-------------------------
1 files changed, 54 insertions(+), 51 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java
index c6c2f49..2bff1e0 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java
@@ -23,8 +23,11 @@
import com.xcong.excoin.rabbit.producer.OrderProducer;
import com.xcong.excoin.utils.CacheSettingUtils;
import com.xcong.excoin.utils.CalculateUtil;
+import com.xcong.excoin.utils.ThreadPoolUtils;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.math.BigDecimal;
@@ -34,6 +37,7 @@
/**
* @author helius
*/
+@Slf4j
@Service
public class OrderWebsocketServiceImpl {
@@ -122,6 +126,7 @@
/**
* 开多止盈
*/
+ @Transactional(rollbackFor = Exception.class)
public void dealForMoreStopPro(List<ContractHoldOrderEntity> orderList, List<OrderModel> list) {
if (CollectionUtils.isNotEmpty(orderList)) {
Map<Long, BigDecimal> modelMap = new HashMap<Long, BigDecimal>();
@@ -148,8 +153,8 @@
System.out.println("执行操作");
// 止盈价
String symbol = order.getSymbol();
- // 本次需要退回的预付款
- BigDecimal prePrice = order.getPrePaymentAmount();
+ // 本次需要退回的保证金
+ BigDecimal prePrice = order.getBondAmount();
Long memberId = order.getMemberId();
MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memberId, "USDT");
if (wallet != null) {
@@ -164,7 +169,7 @@
// 盈亏额度= (当前的币种的平仓价-下单时的建仓价)*购买的手数/规格*倍率
BigDecimal profitLossPrice = (closePrice
.subtract(order.getOpeningPrice()))
- .multiply(new BigDecimal(currentFlat + ""))
+ .multiply(new BigDecimal(currentFlat))
.multiply(symbolSku).setScale(8, BigDecimal.ROUND_DOWN);
MemberEntity memberEntity = memberService.getById(memberId);
@@ -177,28 +182,31 @@
}
}
//回报率
- BigDecimal returnRate = profitLossPrice.divide((order.getPrePaymentAmount().subtract(contractOrderEntity.getClosingFeeAmount())), 8, BigDecimal.ROUND_DOWN);
+ BigDecimal returnRate = profitLossPrice.divide((order.getBondAmount().subtract(contractOrderEntity.getOpeningFeeAmount())), 8, BigDecimal.ROUND_DOWN);
contractOrderEntity.setRewardAmount(profitLossPrice);
contractOrderEntity.setRewardRatio(returnRate);
contractOrderEntity.setClosingFeeAmount(order.getOpeningFeeAmount());
contractOrderEntity.setClosingPrice(closePrice);
contractOrderEntity.setClosingType(6);
+ contractOrderEntity.setOrderType(ContractOrderEntity.ORDER_TYPE_CLOSE_MORE);
BigDecimal totalReturn = BigDecimal.ZERO;
contractOrderService.save(contractOrderEntity);
+
+ contractHoldOrderService.removeById(order.getId());
// 将需要退回的减去手续费
BigDecimal needReturn = prePrice.add(profitLossPrice);
//总退回金额=保证金+收益-手续费
totalReturn = needReturn.subtract(contractOrderEntity.getClosingFeeAmount());
- // 更新钱包
// 总的是收益-平仓手续费
BigDecimal totalBalance = profitLossPrice.subtract(contractOrderEntity.getClosingFeeAmount());
- memberWalletContractService.increaseWalletContractBalanceById(totalBalance, totalReturn, null, wallet.getId());
+
+ memberWalletContractService.increaseWalletContractBalanceById(totalReturn, totalBalance, null, wallet.getId());
// 流水记录 TODO 531e
insertAccountFlow(order, wallet, profitLossPrice, "止盈平仓");
//返佣
- calYj(order.getMemberId(), order.getOpeningFeeAmount(), contractOrderEntity, 2);
+ ThreadPoolUtils.calReturnMoney(order.getMemberId(), order.getOpeningFeeAmount(), contractOrderEntity, AgentReturnEntity.ORDER_TYPE_CLOSE);
}
}
}
@@ -236,7 +244,7 @@
System.out.println("执行操作");
String symbol = order.getSymbol();
// 本次需要退回的预付款
- BigDecimal prePrice = order.getPrePaymentAmount();
+ BigDecimal prePrice = order.getBondAmount();
Long memberId = order.getMemberId();
MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memberId, "USDT");
if (wallet != null) {
@@ -264,14 +272,17 @@
}
}
//回报率
- BigDecimal returnRate = profitLossPrice.divide((order.getPrePaymentAmount().subtract(contractOrderEntity.getClosingFeeAmount())), 8, BigDecimal.ROUND_DOWN);
+ BigDecimal returnRate = profitLossPrice.divide((order.getBondAmount().subtract(contractOrderEntity.getOpeningFeeAmount())), 8, BigDecimal.ROUND_DOWN);
contractOrderEntity.setRewardAmount(profitLossPrice);
contractOrderEntity.setRewardRatio(returnRate);
contractOrderEntity.setClosingFeeAmount(order.getOpeningFeeAmount());
contractOrderEntity.setClosingPrice(closePrice);
contractOrderEntity.setClosingType(7);
+ contractOrderEntity.setOrderType(ContractOrderEntity.ORDER_TYPE_CLOSE_MORE);
BigDecimal totalReturn = BigDecimal.ZERO;
contractOrderService.save(contractOrderEntity);
+
+ contractHoldOrderService.removeById(order.getId());
// 将需要退回的减去手续费
BigDecimal needReturn = prePrice.add(profitLossPrice);
//总退回金额=保证金+收益-手续费
@@ -279,13 +290,13 @@
// 更新钱包
// 总的是收益-平仓手续费
BigDecimal totalBalance = profitLossPrice.subtract(contractOrderEntity.getClosingFeeAmount());
- memberWalletContractService.increaseWalletContractBalanceById(totalBalance, totalReturn, null, wallet.getId());
+ memberWalletContractService.increaseWalletContractBalanceById(totalReturn, totalBalance, null, wallet.getId());
insertAccountFlow(order, wallet, profitLossPrice, "止盈平仓");
//返佣
- calYj(order.getMemberId(), order.getOpeningFeeAmount(), contractOrderEntity, 2);
+ ThreadPoolUtils.calReturnMoney(order.getMemberId(), order.getOpeningFeeAmount(), contractOrderEntity, AgentReturnEntity.ORDER_TYPE_CLOSE);
}
}
}
@@ -325,7 +336,7 @@
String symbol = order.getSymbol();
Long memberId = order.getMemberId();
// 本次需要退回的预付款
- BigDecimal prePrice = order.getPrePaymentAmount();
+ BigDecimal prePrice = order.getBondAmount();
MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memberId, "USDT");
if (wallet != null) {
@@ -353,14 +364,17 @@
}
}
//回报率
- BigDecimal returnRate = profitLossPrice.divide((order.getPrePaymentAmount().subtract(contractOrderEntity.getClosingFeeAmount())), 8, BigDecimal.ROUND_DOWN);
+ BigDecimal returnRate = profitLossPrice.divide((order.getBondAmount().subtract(contractOrderEntity.getOpeningFeeAmount())), 8, BigDecimal.ROUND_DOWN);
contractOrderEntity.setRewardAmount(profitLossPrice);
contractOrderEntity.setRewardRatio(returnRate);
contractOrderEntity.setClosingFeeAmount(order.getOpeningFeeAmount());
contractOrderEntity.setClosingPrice(closePrice);
+ contractOrderEntity.setOrderType(ContractOrderEntity.ORDER_TYPE_CLOSE_MORE);
contractOrderEntity.setClosingType(8);
BigDecimal totalReturn = BigDecimal.ZERO;
contractOrderService.save(contractOrderEntity);
+
+ contractHoldOrderService.removeById(order.getId());
// 将需要退回的减去手续费
BigDecimal needReturn = prePrice.add(profitLossPrice);
//总退回金额=保证金+收益-手续费
@@ -368,12 +382,13 @@
// 更新钱包
// 总的是收益-平仓手续费
BigDecimal totalBalance = profitLossPrice.subtract(contractOrderEntity.getClosingFeeAmount());
- memberWalletContractService.increaseWalletContractBalanceById(totalBalance, totalReturn, null, wallet.getId());
+
+ memberWalletContractService.increaseWalletContractBalanceById(totalReturn, totalBalance, null, wallet.getId());
insertAccountFlow(order, wallet, profitLossPrice, "开多止损平仓");
//返佣
- calYj(order.getMemberId(), order.getOpeningFeeAmount(), contractOrderEntity, 2);
+ ThreadPoolUtils.calReturnMoney(order.getMemberId(), order.getOpeningFeeAmount(), contractOrderEntity, AgentReturnEntity.ORDER_TYPE_CLOSE);
}
}
}
@@ -412,7 +427,7 @@
String symbol = order.getSymbol();
Long memberId = order.getMemberId();
// 本次需要退回的预付款
- BigDecimal prePrice = order.getPrePaymentAmount();
+ BigDecimal prePrice = order.getBondAmount();
MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memberId, "USDT");
if (wallet != null) {
@@ -440,14 +455,18 @@
}
}
//回报率
- BigDecimal returnRate = profitLossPrice.divide((order.getPrePaymentAmount().subtract(contractOrderEntity.getClosingFeeAmount())), 8, BigDecimal.ROUND_DOWN);
+ BigDecimal returnRate = profitLossPrice.divide((order.getBondAmount().subtract(contractOrderEntity.getOpeningFeeAmount())), 8, BigDecimal.ROUND_DOWN);
contractOrderEntity.setRewardAmount(profitLossPrice);
contractOrderEntity.setRewardRatio(returnRate);
contractOrderEntity.setClosingFeeAmount(order.getOpeningFeeAmount());
contractOrderEntity.setClosingPrice(closePrice);
contractOrderEntity.setClosingType(9);
+ contractOrderEntity.setOrderType(ContractOrderEntity.ORDER_TYPE_CLOSE_LESS);
BigDecimal totalReturn = BigDecimal.ZERO;
contractOrderService.save(contractOrderEntity);
+
+ contractHoldOrderService.removeById(order.getId());
+
// 将需要退回的减去手续费
BigDecimal needReturn = prePrice.add(profitLossPrice);
//总退回金额=保证金+收益-手续费
@@ -455,13 +474,12 @@
// 更新钱包
// 总的是收益-平仓手续费
BigDecimal totalBalance = profitLossPrice.subtract(contractOrderEntity.getClosingFeeAmount());
- memberWalletContractService.increaseWalletContractBalanceById(totalBalance, totalReturn, null, wallet.getId());
+ memberWalletContractService.increaseWalletContractBalanceById(totalReturn, totalBalance, null, wallet.getId());
insertAccountFlow(order, wallet, profitLossPrice, "开空止损平仓");
//返佣
- calYj(order.getMemberId(), order.getOpeningFeeAmount(), contractOrderEntity, 2);
-
+ ThreadPoolUtils.calReturnMoney(order.getMemberId(), order.getOpeningFeeAmount(), contractOrderEntity, AgentReturnEntity.ORDER_TYPE_CLOSE);
}
}
}
@@ -540,6 +558,7 @@
contractOrderEntity.setEntrustOpeningPrice(coinsCoinsOrder.getEntrustPrice());
contractOrderEntity.setEntrustTime(coinsCoinsOrder.getCreateTime());
contractOrderEntity.setOpeningTime(new Date());
+
contractOrderEntity.setId(null);
contractOrderService.save(contractOrderEntity);
// 发送爆仓的队列
@@ -554,11 +573,12 @@
producer.sendPriceOperate(JSONObject.toJSONString(model));
}
// 扣除手续费
- BigDecimal totalBalance = wallet.getTotalBalance().subtract(openFeePrice);
+ BigDecimal totalBalance = openFeePrice.negate();
contractEntrustOrderService.removeById(coinsCoinsOrder.getId());
- memberWalletContractService.increaseWalletContractBalanceById(null, totalBalance, null, wallet.getId());
- // TODO 531 待写
- calYj(memId, openFeePrice, contractOrderEntity, 1);
+ memberWalletContractService.increaseWalletContractBalanceById(null, totalBalance, coinsCoinsOrder.getBondAmount().negate(), wallet.getId());
+
+ //返佣
+ ThreadPoolUtils.calReturnMoney(memberEntity.getId(), openFeePrice, contractOrderEntity, AgentReturnEntity.ORDER_TYPE_OPEN);
}
}
}
@@ -569,15 +589,11 @@
* @param
*/
public void dealCoinOut(List<ContractHoldOrderEntity> orderList, List<OrderModel> orderModels) {
- // 需要比较查询到的和消息发来的单的爆仓操作次序号是否相同
- // 构建map
-
if (CollectionUtils.isNotEmpty(orderList)) {
Map<Long, Integer> modelMap = new HashMap<Long, Integer>();
for (OrderModel model : orderModels) {
modelMap.put(model.getOrderId(), model.getOperateNo());
}
- // TradeSetting tradeSetting = tradeMapper.findTradeSetting();
for (ContractHoldOrderEntity coinsOrder : orderList) {
Long orderId = coinsOrder.getId();
Integer operateNo = coinsOrder.getOperateNo();
@@ -589,9 +605,6 @@
}
boolean isDone = false;
Long memId = coinsOrder.getMemberId();
- MemberEntity byId = memberService.getById(memId);
- String symbol = coinsOrder.getSymbol();
- //TradeSymbolSku symbolSku = tradeMapper.findSymbolSkubySymbol(symbol);
BigDecimal nowPrice = coinsOrder.getForceClosingPrice();
// 创建订单(加入历史表的订单)
ContractOrderEntity contractOrderEntity = ContractHoldOrderEntityMapper.INSTANCE.holdOrderToOrder(coinsOrder);
@@ -613,31 +626,25 @@
if (isDone) {
//删除次仓订单
contractHoldOrderService.removeById(orderId);
-
- //系统自动平仓（爆仓）
-// Double closingPrice = nowPrice
-// .multiply(new BigDecimal(tradeSetting.getClosingRatio()).divide(new BigDecimal(100), 8, BigDecimal.ROUND_DOWN))
-// .multiply(symbolSku.getLotNumber())// 规格
-// .multiply(new BigDecimal(coinsOrder.getSymbolSkuNumber()))
-// .setScale(8, BigDecimal.ROUND_DOWN).doubleValue();
+ // 订单状态转换
+ if (ContractOrderEntity.ORDER_TYPE_OPEN_MORE == contractOrderEntity.getOrderType()) {
+ contractOrderEntity.setOrderType(ContractOrderEntity.ORDER_TYPE_CLOSE_MORE);
+ } else {
+ contractOrderEntity.setOrderType(ContractOrderEntity.ORDER_TYPE_CLOSE_LESS);
+ }
//更新主表订单状态位为“已平仓”
contractOrderEntity.setId(null);
- contractOrderEntity.setClosingPrice(BigDecimal.ZERO);
- //order.setPayTotalPrice(coinsOrder.getPrePrice()+coinsOrder.getClosingPrice());// 总支付金额(预付款)
-
contractOrderEntity.setClosingPrice(nowPrice);
contractOrderEntity.setClosingTime(new Date());
- contractOrderEntity.setRewardAmount((coinsOrder.getOpeningFeeAmount().multiply(new BigDecimal("2")).subtract(coinsOrder.getPrePaymentAmount())));
- //order.setRewardRatio(-(coinsOrder.getPrePrice() - (2*coinsOrder.getClosingPrice())));
+ contractOrderEntity.setClosingFeeAmount(coinsOrder.getOpeningFeeAmount());
+ contractOrderEntity.setRewardAmount(coinsOrder.getBondAmount().subtract(contractOrderEntity.getOpeningFeeAmount()).negate());
contractOrderService.save(contractOrderEntity);
//更新用户钱包数据
MemberWalletContractEntity usdt = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memId, "USDT");
- // Double totalPrice = wallet.getTotalBalance() - coinsOrder.getPrePrice();
// 减去的时候用负数
- BigDecimal totalPrice = coinsOrder.getPrePaymentAmount().negate();
- //Double totalPrice = - coinsOrder.getPrePrice();
+ BigDecimal totalPrice = coinsOrder.getBondAmount().negate();
memberWalletContractService.increaseWalletContractBalanceById(null, totalPrice, null, usdt.getId());
// 流水记录 TODO
MemberAccountFlowEntity record = new MemberAccountFlowEntity();
@@ -647,13 +654,12 @@
record.setBalance(usdt.getAvailableBalance());
record.setMemberId(memId);
record.setSymbol(coinsOrder.getSymbol());
- record.setPrice(coinsOrder.getPrePaymentAmount());
+ record.setPrice(coinsOrder.getBondAmount());
memberAccountFlowEntityDao.insert(record);
}
}
}
}
-
public void calYj(Long mid, BigDecimal money, ContractOrderEntity order, int type) {
if (money != null) {
@@ -727,8 +733,5 @@
agent.setInviteId(entry.getKey());
agentReturnDao.insert(agent);
}
-
-
}
-
}
--
Gitblit v1.9.1