From eaca7c0ae42149e8bcd7e651e94a56756e7b64c7 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 05 Feb 2021 11:32:00 +0800
Subject: [PATCH] modify sms config
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java
index 7e1b743..84ebf76 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java
@@ -1,6 +1,7 @@
package com.xcong.excoin.modules.contract.service.impl;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.xcong.excoin.common.contants.AppContants;
@@ -485,14 +486,16 @@
MemberEntity memberEntity = memberDao.selectById(wholePriceData.getMemberId());
List<HoldOrderDataModel> list = wholePriceData.getList();
if (CollUtil.isNotEmpty(list)) {
+ String batchNo = IdUtil.randomUUID();
for (HoldOrderDataModel holdOrderDataModel : list) {
ContractHoldOrderEntity holdOrderEntity = contractHoldOrderDao.selectById(holdOrderDataModel.getId());
if (holdOrderEntity == null) {
log.info("持仓不存在:{}", holdOrderDataModel.getId());
+ redisUtils.del(AppContants.WHOLE_BOMB_PREFIX + wholePriceData.getMemberId());
continue;
}
- holdOrderEntity.setForceClosingPrice(getForceSetPrice(wholePriceData, holdOrderEntity, holdOrderDataModel.getSymbol()));
+// holdOrderEntity.setForceClosingPrice(getForceSetPrice(wholePriceData, holdOrderEntity, holdOrderDataModel.getSymbol()));
contractHoldOrderDao.deleteById(holdOrderDataModel.getId());
ContractOrderEntity contractOrderEntity = ContractHoldOrderEntityMapper.INSTANCE.holdOrderToOrder(holdOrderEntity);
@@ -507,6 +510,7 @@
contractOrderEntity.setRewardRatio(rewardRatio);
contractOrderEntity.setRewardAmount(holdOrderDataModel.getRewardAmount().add(contractOrderEntity.getHoldBond().negate()));
contractOrderEntity.setClosingPrice(holdOrderDataModel.getClosingPrice());
+ contractOrderEntity.setForceClosingPrice(holdOrderDataModel.getClosingPrice());
// 订单状态转换
if (ContractOrderEntity.ORDER_TYPE_OPEN_MORE == contractOrderEntity.getOrderType()) {
@@ -515,7 +519,7 @@
contractOrderEntity.setOrderType(ContractOrderEntity.ORDER_TYPE_CLOSE_LESS);
}
contractOrderEntity.setClosingTime(new Date());
-
+ contractOrderEntity.setBatchNo(batchNo);
contractOrderDao.insert(contractOrderEntity);
}
@@ -523,11 +527,13 @@
BigDecimal totalAmount = BigDecimal.ZERO;
if (CollUtil.isNotEmpty(entrustOrder)) {
for (ContractEntrustOrderEntity contractEntrustOrderEntity : entrustOrder) {
- totalAmount.add(contractEntrustOrderEntity.getEntrustAmount());
+ totalAmount = totalAmount.add(contractEntrustOrderEntity.getEntrustAmount());
}
}
memberWalletContractDao.increaseWalletContractBalanceById(wallet.getAvailableBalance().negate(), wallet.getTotalBalance().subtract(totalAmount).negate(), null, wallet.getId());
+
+ redisUtils.del(AppContants.WHOLE_BOMB_PREFIX + wholePriceData.getMemberId());
} else {
log.info("参数有误:{}", memberEntity.getId());
}
--
Gitblit v1.9.1