From 2991de79ef9863f4905844087754d3d0fad13bf1 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 31 Mar 2021 10:37:06 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 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 b547a9d..f44934b 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
@@ -195,24 +195,24 @@
memberWalletContractDao.increaseWalletContractBalanceById(returnMoney, returnMoney, null, traderWallet.getId());
insertReturnProfitDetail(traderInfoEntity.getMemberId(), memberEntity.getId(), returnMoney, holdOrderEntity.getOrderNo());
//增加返佣提醒
- String orderNo = holdOrderEntity.getOrderNo();
- LogRecordUtils.insertFollowerNotice(traderInfoEntity.getMemberId(),
- NoticeConstant.RETURN_MONEY_TITLE,
- StrUtil.format(NoticeConstant.RETURN_MONEY_CONTENT,
- orderNo,
- holdOrderEntity.getSymbol(),
- returnMoney.setScale(2, BigDecimal.ROUND_HALF_UP).toString()));
- //带单返利的记录要在资产页面的其他记录
- LogRecordUtils.insertMemberAccountMoneyChange(
- traderInfoEntity.getMemberId(),
- StrUtil.format(NoticeConstant.RETURN_MONEY_CONTENT,
- orderNo,
- holdOrderEntity.getSymbol(),
- returnMoney.setScale(2, BigDecimal.ROUND_HALF_UP).toString()),
- returnMoney.setScale(2, BigDecimal.ROUND_HALF_UP),
- MemberWalletCoinEnum.WALLETCOINCODE.getValue(),
- MemberAccountMoneyChange.STATUS_SUCCESS_INTEGER,
- MemberAccountMoneyChange.TYPE_WALLET_AGENT);
+// String orderNo = holdOrderEntity.getOrderNo();
+// LogRecordUtils.insertFollowerNotice(traderInfoEntity.getMemberId(),
+// NoticeConstant.RETURN_MONEY_TITLE,
+// StrUtil.format(NoticeConstant.RETURN_MONEY_CONTENT,
+// orderNo,
+// holdOrderEntity.getSymbol(),
+// returnMoney.setScale(2, BigDecimal.ROUND_HALF_UP).toString()));
+// //带单返利的记录要在资产页面的其他记录
+// LogRecordUtils.insertMemberAccountMoneyChange(
+// traderInfoEntity.getMemberId(),
+// StrUtil.format(NoticeConstant.RETURN_MONEY_CONTENT_MAMC,
+// orderNo,
+// holdOrderEntity.getSymbol(),
+// returnMoney.setScale(2, BigDecimal.ROUND_HALF_UP).toString()),
+// returnMoney.setScale(2, BigDecimal.ROUND_HALF_UP),
+// MemberWalletCoinEnum.WALLETCOINCODE.getValue(),
+// MemberAccountMoneyChange.STATUS_SUCCESS_INTEGER,
+// MemberAccountMoneyChange.TYPE_WALLET_AGENT);
}
}
}
@@ -552,6 +552,7 @@
contractOrderEntity.setRewardAmount(holdOrderDataModel.getRewardAmount().add(contractOrderEntity.getHoldBond().negate()));
contractOrderEntity.setClosingPrice(holdOrderDataModel.getClosingPrice());
contractOrderEntity.setForceClosingPrice(holdOrderDataModel.getClosingPrice());
+ contractOrderEntity.setStopProfitPrice(CalculateUtil.calForcePriceForWhole(memberEntity, holdOrderEntity));
// 订单状态转换
if (ContractOrderEntity.ORDER_TYPE_OPEN_MORE == contractOrderEntity.getOrderType()) {
--
Gitblit v1.9.1