From 2cdf732d4130b227514d2c0ba1e40e6c1cece54a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 30 Mar 2021 18:52:59 +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 | 5 ++---
src/main/java/com/xcong/excoin/modules/documentary/common/NoticeConstant.java | 1 +
src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml | 2 +-
3 files changed, 4 insertions(+), 4 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..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
@@ -205,10 +205,9 @@
//带单返利的记录要在资产页面的其他记录
LogRecordUtils.insertMemberAccountMoneyChange(
traderInfoEntity.getMemberId(),
- StrUtil.format(NoticeConstant.RETURN_MONEY_CONTENT,
+ StrUtil.format(NoticeConstant.RETURN_MONEY_CONTENT_MAMC,
orderNo,
- holdOrderEntity.getSymbol(),
- returnMoney.setScale(2, BigDecimal.ROUND_HALF_UP).toString()),
+ holdOrderEntity.getSymbol()),
returnMoney.setScale(2, BigDecimal.ROUND_HALF_UP),
MemberWalletCoinEnum.WALLETCOINCODE.getValue(),
MemberAccountMoneyChange.STATUS_SUCCESS_INTEGER,
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 7158955..2c1c659 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
@@ -32,5 +32,6 @@
public static final String RETURN_MONEY_TITLE = "跟单-平仓返佣";
public static final String RETURN_MONEY_CONTENT = "平仓成功,收到的合约单号为{}，币种为{}的返佣金额：{}";
+ public static final String RETURN_MONEY_CONTENT_MAMC = "合约{},币种{}的返利";
}
diff --git a/src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml b/src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml
index 90a0164..d3c6b83 100644
--- a/src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml
+++ b/src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml
@@ -64,7 +64,7 @@
<if test="record != null">
<where>
type = 3
- and (content like '%佣金到账%' or content like '%活动%')
+ and (content like '%佣金到账%' or content like '%活动%' or content like '%返利%')
<if test="record.memberId != null" >
and member_id=#{record.memberId}
</if>
--
Gitblit v1.9.1