From fc20b8df341b8a12daa624692a264f21cf24683d Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 30 Mar 2021 18:42:39 +0800
Subject: [PATCH] 20210329 跟单平仓返利记录
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 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 ba5c3a1..ac84f21 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
@@ -6,9 +6,11 @@
import com.alibaba.fastjson.JSONObject;
import com.xcong.excoin.common.contants.AppContants;
import com.xcong.excoin.common.enumerates.CoinTypeEnum;
+import com.xcong.excoin.common.enumerates.MemberWalletCoinEnum;
import com.xcong.excoin.common.enumerates.OrderClosingTypeEnum;
import com.xcong.excoin.common.system.service.CommonService;
import com.xcong.excoin.modules.coin.entity.MemberAccountFlowEntity;
+import com.xcong.excoin.modules.coin.entity.MemberAccountMoneyChange;
import com.xcong.excoin.modules.contract.dao.ContractEntrustOrderDao;
import com.xcong.excoin.modules.contract.dao.ContractHoldOrderDao;
import com.xcong.excoin.modules.contract.dao.ContractOrderDao;
@@ -197,9 +199,19 @@
LogRecordUtils.insertFollowerNotice(traderInfoEntity.getMemberId(),
NoticeConstant.RETURN_MONEY_TITLE,
StrUtil.format(NoticeConstant.RETURN_MONEY_CONTENT,
- memberEntity.getInviteId(),
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),
+ MemberWalletCoinEnum.WALLETCOINCODE.getValue(),
+ MemberAccountMoneyChange.STATUS_SUCCESS_INTEGER,
+ MemberAccountMoneyChange.TYPE_WALLET_AGENT);
}
}
}
@@ -293,6 +305,11 @@
// 获取平仓张数
Integer closeCnt = (Integer) redisUtils.get(AppContants.CLOSING_ORDER_PREFIX + holdOrderEntity.getId());
+ // 无法从redis中获取平仓张数，说明来自一键平仓
+ if (closeCnt == null) {
+ closeCnt = holdOrderEntity.getSymbolCntSale();
+ holdOrderEntity.setSymbolCntSale(0);
+ }
MemberSettingEntity memberSettingEntity = memberSettingDao.selectMemberSettingByMemberId(memberEntity.getId());
// 开多
--
Gitblit v1.9.1