From 4dff18fc545706cc9ea09e0cdf4daeebc16b064f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 03 Jun 2020 19:26:05 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java | 95 +++++++++++++++++++----------------------------
1 files changed, 38 insertions(+), 57 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 367a0bd..f6ca013 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
@@ -6,6 +6,7 @@
import com.xcong.excoin.modules.contract.entity.ContractEntrustOrderEntity;
import com.xcong.excoin.modules.contract.entity.ContractHoldOrderEntity;
import com.xcong.excoin.modules.contract.entity.ContractOrderEntity;
+import com.xcong.excoin.modules.contract.mapper.ContractEntrustOrderEntityMapper;
import com.xcong.excoin.modules.contract.mapper.ContractHoldOrderEntityMapper;
import com.xcong.excoin.modules.contract.service.ContractEntrustOrderService;
import com.xcong.excoin.modules.contract.service.ContractHoldOrderService;
@@ -22,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;
@@ -33,6 +37,7 @@
/**
* @author helius
*/
+@Slf4j
@Service
public class OrderWebsocketServiceImpl {
@@ -121,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>();
@@ -147,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) {
@@ -163,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);
@@ -176,7 +182,7 @@
}
}
//回报率
- BigDecimal returnRate = profitLossPrice.divide((order.getPrePaymentAmount().subtract(contractOrderEntity.getClosingFeeAmount())), 8, BigDecimal.ROUND_DOWN);
+ BigDecimal returnRate = profitLossPrice.divide((order.getPrePaymentAmount().subtract(contractOrderEntity.getOpeningFeeAmount())), 8, BigDecimal.ROUND_DOWN);
contractOrderEntity.setRewardAmount(profitLossPrice);
contractOrderEntity.setRewardRatio(returnRate);
contractOrderEntity.setClosingFeeAmount(order.getOpeningFeeAmount());
@@ -184,11 +190,12 @@
contractOrderEntity.setClosingType(6);
BigDecimal totalReturn = BigDecimal.ZERO;
contractOrderService.save(contractOrderEntity);
+
+ contractEntrustOrderService.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());
@@ -197,7 +204,7 @@
insertAccountFlow(order, wallet, profitLossPrice, "止盈平仓");
//返佣
- calYj(order.getMemberId(), order.getOpeningFeeAmount(), contractOrderEntity, 2);
+ ThreadPoolUtils.calReturnMoney(order.getMemberId(), order.getOpeningFeeAmount(), contractOrderEntity, AgentReturnEntity.ORDER_TYPE_CLOSE);
}
}
}
@@ -235,7 +242,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) {
@@ -263,7 +270,7 @@
}
}
//回报率
- BigDecimal returnRate = profitLossPrice.divide((order.getPrePaymentAmount().subtract(contractOrderEntity.getClosingFeeAmount())), 8, BigDecimal.ROUND_DOWN);
+ BigDecimal returnRate = profitLossPrice.divide((order.getPrePaymentAmount().subtract(contractOrderEntity.getOpeningFeeAmount())), 8, BigDecimal.ROUND_DOWN);
contractOrderEntity.setRewardAmount(profitLossPrice);
contractOrderEntity.setRewardRatio(returnRate);
contractOrderEntity.setClosingFeeAmount(order.getOpeningFeeAmount());
@@ -271,6 +278,8 @@
contractOrderEntity.setClosingType(7);
BigDecimal totalReturn = BigDecimal.ZERO;
contractOrderService.save(contractOrderEntity);
+
+ contractHoldOrderService.removeById(order.getId());
// 将需要退回的减去手续费
BigDecimal needReturn = prePrice.add(profitLossPrice);
//总退回金额=保证金+收益-手续费
@@ -284,7 +293,7 @@
insertAccountFlow(order, wallet, profitLossPrice, "止盈平仓");
//返佣
- calYj(order.getMemberId(), order.getOpeningFeeAmount(), contractOrderEntity, 2);
+ ThreadPoolUtils.calReturnMoney(order.getMemberId(), order.getOpeningFeeAmount(), contractOrderEntity, AgentReturnEntity.ORDER_TYPE_CLOSE);
}
}
}
@@ -324,7 +333,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) {
@@ -352,7 +361,7 @@
}
}
//回报率
- BigDecimal returnRate = profitLossPrice.divide((order.getPrePaymentAmount().subtract(contractOrderEntity.getClosingFeeAmount())), 8, BigDecimal.ROUND_DOWN);
+ BigDecimal returnRate = profitLossPrice.divide((order.getPrePaymentAmount().subtract(contractOrderEntity.getOpeningFeeAmount())), 8, BigDecimal.ROUND_DOWN);
contractOrderEntity.setRewardAmount(profitLossPrice);
contractOrderEntity.setRewardRatio(returnRate);
contractOrderEntity.setClosingFeeAmount(order.getOpeningFeeAmount());
@@ -372,7 +381,7 @@
insertAccountFlow(order, wallet, profitLossPrice, "开多止损平仓");
//返佣
- calYj(order.getMemberId(), order.getOpeningFeeAmount(), contractOrderEntity, 2);
+ ThreadPoolUtils.calReturnMoney(order.getMemberId(), order.getOpeningFeeAmount(), contractOrderEntity, AgentReturnEntity.ORDER_TYPE_CLOSE);
}
}
}
@@ -459,8 +468,7 @@
insertAccountFlow(order, wallet, profitLossPrice, "开空止损平仓");
//返佣
- calYj(order.getMemberId(), order.getOpeningFeeAmount(), contractOrderEntity, 2);
-
+ ThreadPoolUtils.calReturnMoney(order.getMemberId(), order.getOpeningFeeAmount(), contractOrderEntity, AgentReturnEntity.ORDER_TYPE_CLOSE);
}
}
}
@@ -486,7 +494,6 @@
* @param
*/
public void dealLimitBuyOrder(List<ContractEntrustOrderEntity> orderList) {
-
//List<CoinsCoinsOrder> orderList = orderMapper.selectOrderByBatchNo(batchno);
if (CollectionUtils.isNotEmpty(orderList)) {
ContractHoldOrderEntity contractHoldOrderEntity = null;
@@ -496,23 +503,21 @@
continue;
}
- contractHoldOrderEntity = new ContractHoldOrderEntity();
+ // 委托单bean转换为持仓单bean
+ contractHoldOrderEntity = ContractEntrustOrderEntityMapper.INSTANCE.entrustOrderToHoldOrder(coinsCoinsOrder);
+ contractHoldOrderEntity.setId(null);
Long memId = coinsCoinsOrder.getMemberId();
MemberEntity memberEntity = memberService.getById(memId);
BigDecimal entrustPrice = coinsCoinsOrder.getEntrustPrice();
int symbolCnt = coinsCoinsOrder.getSymbolCnt();
int type = coinsCoinsOrder.getEntrustType();
- //开仓价
- // Double openPrice = coinsCoinsOrder.getOpenPrice().doubleValue();
- //委托价
- // Double markPrice = coinsCoinsOrder.getMarkPrice();
+
if (type == 1) {
// 开多
contractHoldOrderEntity.setOpeningType(ContractHoldOrderEntity.OPENING_TYPE_MORE);
} else {
// 开空
contractHoldOrderEntity.setOpeningType(ContractHoldOrderEntity.OPENING_TYPE_LESS);
-
}
//持仓单赋值
@@ -534,10 +539,14 @@
contractHoldOrderEntity.setForceClosingPrice(forceSetPrice);
contractHoldOrderEntity.setLeverRatio(coinsCoinsOrder.getLeverRatio());
contractHoldOrderEntity.setOpeningPrice(entrustPrice);
+ contractHoldOrderEntity.setTradeType(ContractHoldOrderEntity.TRADE_TYPE_LIMIT);
contractHoldOrderService.save(contractHoldOrderEntity);
// 需要一个历史插入
ContractOrderEntity contractOrderEntity = ContractHoldOrderEntityMapper.INSTANCE.holdOrderToOrder(contractHoldOrderEntity);
+ contractOrderEntity.setEntrustOpeningPrice(coinsCoinsOrder.getEntrustPrice());
+ contractOrderEntity.setEntrustTime(coinsCoinsOrder.getCreateTime());
+ contractOrderEntity.setOpeningTime(new Date());
contractOrderEntity.setId(null);
contractOrderService.save(contractOrderEntity);
// 发送爆仓的队列
@@ -552,18 +561,12 @@
producer.sendPriceOperate(JSONObject.toJSONString(model));
}
// 扣除手续费
- //double totalBalance = wallet.getTotalBalance() - coinsCoinsOrder.getClosingPrice();
BigDecimal totalBalance = openFeePrice.negate();
-
- /** TradeSetting tradeSetting = tradeSettingCache.getTradeSetting();
-
- Double totalPayPrice = new BigDecimal(coinsCoinsOrder.getPrePrice()).add(new BigDecimal(coinsCoinsOrder.getClosingPrice())).add(new BigDecimal(coinsCoinsOrder.getClosingPrice()))
- .setScale(8, BigDecimal.ROUND_HALF_UP).doubleValue();
- totalBalance = totalBalance+(-totalPayPrice*(Double.valueOf(tradeSetting.getSpread())/10000));*/
-
+ contractEntrustOrderService.removeById(coinsCoinsOrder.getId());
memberWalletContractService.increaseWalletContractBalanceById(null, totalBalance, null, wallet.getId());
- // TODO 531 待写
- calYj(memId, contractOrderEntity.getClosingFeeAmount(), contractOrderEntity, 1);
+
+ //返佣
+ ThreadPoolUtils.calReturnMoney(memberEntity.getId(), openFeePrice, contractOrderEntity, AgentReturnEntity.ORDER_TYPE_OPEN);
}
}
}
@@ -574,15 +577,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();
@@ -594,9 +593,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);
@@ -619,31 +615,20 @@
//删除次仓订单
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();
//更新主表订单状态位为“已平仓”
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.setRewardAmount(coinsOrder.getPrePaymentAmount().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();
- memberWalletContractService.increaseWalletContractBalanceById(null, totalPrice, null, usdt.getId());
+ BigDecimal totalPrice = coinsOrder.getBondAmount().negate();
+ memberWalletContractService.increaseWalletContractBalanceById(null, totalPrice, totalPrice, usdt.getId());
// 流水记录 TODO
MemberAccountFlowEntity record = new MemberAccountFlowEntity();
record.setCreateTime(new Date());
@@ -652,13 +637,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) {
@@ -732,8 +716,5 @@
agent.setInviteId(entry.getKey());
agentReturnDao.insert(agent);
}
-
-
}
-
}
--
Gitblit v1.9.1