From 83dab684cb4db66e67d8d08adb2d6e05277a5e9b Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 14 Apr 2021 11:10:02 +0800
Subject: [PATCH] Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity
---
src/main/resources/mapper/member/MemberCoinWithdrawDao.xml | 2 +-
src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java | 5 +++--
src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml | 3 +--
3 files changed, 5 insertions(+), 5 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 9ff4d66..c4ddc5f 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
@@ -184,8 +184,9 @@
FollowTraderInfoEntity traderInfoEntity = null;
// 判断当前订单是否为跟单
if (ContractOrderEntity.CONTRACTTYPE_DOCUMENTARY == holdOrderEntity.getContractType()) {
- // 若不为交易员，则计算跟随者订单返利
- if (!MemberEntity.IS_TRADER_Y.equals(memberEntity.getIsTrader())) {
+ // 若不为交易员且不是测试账号，则计算跟随者订单返利
+ if (!MemberEntity.IS_TRADER_Y.equals(memberEntity.getIsTrader()) &&
+ !MemberEntity.ACCOUNT_TYPE_TEST.equals(memberEntity.getAccountType())) {
traderInfoEntity = followTraderInfoDao.selectTraderInfoByOrderId(holdOrderEntity.getId());
if (profitOrLoss.compareTo(BigDecimal.ZERO) > 0) {
// 计算需返利给交易员的金额
diff --git a/src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml b/src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml
index d3c6b83..0c3addb 100644
--- a/src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml
+++ b/src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml
@@ -5,8 +5,7 @@
<select id="coinInList" resultType="com.xcong.excoin.modules.coin.entity.MemberAccountMoneyChange">
select * from member_account_money_change
where member_id = #{record.memberId}
- and (content like '%转%' or content like '%收款%' or (content like '%提币%' and withdraw_id in
- (select id from member_coin_withdraw w where w.member_id = #{record.memberId} and is_inside = "Y")) )
+ and (content like '%转%' or content like '%收款%')
order by create_time desc
</select>
diff --git a/src/main/resources/mapper/member/MemberCoinWithdrawDao.xml b/src/main/resources/mapper/member/MemberCoinWithdrawDao.xml
index bafe4bc..f2376b1 100644
--- a/src/main/resources/mapper/member/MemberCoinWithdrawDao.xml
+++ b/src/main/resources/mapper/member/MemberCoinWithdrawDao.xml
@@ -4,7 +4,7 @@
<select id="findMemberCoinWithdrawInPage" resultType="com.xcong.excoin.modules.member.entity.MemberCoinWithdrawEntity">
select * from member_coin_withdraw
- where member_id = #{record.memberId} and is_inside = 'N'
+ where member_id = #{record.memberId}
order by create_time desc
</select>
--
Gitblit v1.9.1