From 4512cd00a5462ac9e1a82f18847a006df99b4ed8 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 30 Mar 2021 17:26:46 +0800
Subject: [PATCH] 20210329  跟单平仓返利记录

---
 src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java |   15 ++++++++++++++-
 src/main/java/com/xcong/excoin/modules/documentary/common/NoticeConstant.java            |    2 +-
 2 files changed, 15 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 efcf829..b547a9d 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,20 @@
                         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,
+                                        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);
                     }
                 }
             }
diff --git a/src/main/java/com/xcong/excoin/modules/documentary/common/NoticeConstant.java b/src/main/java/com/xcong/excoin/modules/documentary/common/NoticeConstant.java
index d2d6206..7158955 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/common/NoticeConstant.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/common/NoticeConstant.java
@@ -31,6 +31,6 @@
     public static final String BOMB_ORDER_CONTENT = "因市场剧烈波动,您的{}合约已被强制平仓,交易员:{}";
 
     public static final String RETURN_MONEY_TITLE = "跟单-平仓返佣";
-    public static final String RETURN_MONEY_CONTENT = "跟单平仓成功,收到{}的合约单号:{}的返佣金额:{}";
+    public static final String RETURN_MONEY_CONTENT = "平仓成功,收到的合约单号为{},币种为{}的返佣金额:{}";
 
 }

--
Gitblit v1.9.1