From 25c3d8e604e2ca24da6aeb2c018acafca9b11c38 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 30 Mar 2021 11:29:20 +0800
Subject: [PATCH] Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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 d8e137b..e66c855 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
@@ -186,7 +186,13 @@
memberWalletContractDao.increaseWalletContractBalanceById(returnMoney, returnMoney, null, traderWallet.getId());
insertReturnProfitDetail(traderInfoEntity.getMemberId(), memberEntity.getId(), returnMoney, holdOrderEntity.getOrderNo());
//增加返佣提醒
- LogRecordUtils.insertFollowerNotice(traderInfoEntity.getMemberId(), NoticeConstant.RETURN_MONEY_TITLE, StrUtil.format(NoticeConstant.RETURN_MONEY_CONTENT, holdOrderEntity.getOrderNo(), returnMoney.setScale(2, BigDecimal.ROUND_HALF_UP).toString()));
+ String orderNo = holdOrderEntity.getOrderNo();
+ LogRecordUtils.insertFollowerNotice(traderInfoEntity.getMemberId(),
+ NoticeConstant.RETURN_MONEY_TITLE,
+ StrUtil.format(NoticeConstant.RETURN_MONEY_CONTENT,
+ memberEntity.getInviteId(),
+ orderNo,
+ returnMoney.setScale(2, BigDecimal.ROUND_HALF_UP).toString()));
}
}
}
@@ -220,7 +226,7 @@
if (MemberEntity.IS_TRADER_Y.equals(memberEntity.getIsTrader())) {
followOrderOperationService.closingFollowOrders(holdOrderEntity.getOrderNo());
} else {
- followFollowerProfitDao.updateFollowerProfitByTradeMemberId(holdOrderEntity.getBondAmount(), profitOrLoss, traderInfoEntity.getMemberId(), memberEntity.getId());
+ //followFollowerProfitDao.updateFollowerProfitByTradeMemberId(holdOrderEntity.getBondAmount(), profitOrLoss, traderInfoEntity.getMemberId(), memberEntity.getId());
LogRecordUtils.insertFollowerNotice(memberEntity.getId(), NoticeConstant.CLOSE_ORDER_TITLE, StrUtil.format(NoticeConstant.CLOSE_ORDER_CONTENT, contractOrderEntity.getSymbol(), contractOrderEntity.getClosingPrice().setScale(2, BigDecimal.ROUND_HALF_UP).toString(), profitOrLoss.setScale(2, BigDecimal.ROUND_HALF_UP).toString(), traderInfoEntity.getNickname()));
}
}
--
Gitblit v1.9.1