From c405afee7ac16b9141275310ad29a3740c6a870c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 30 Mar 2021 17:28:51 +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 | 15 ++++++++++++++-
1 files changed, 14 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 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);
}
}
}
--
Gitblit v1.9.1