From fb73002d31a565e65df8da36af8f3a0e20a21e9d Mon Sep 17 00:00:00 2001
From: gao <gaoleox@163>
Date: Mon, 13 Jul 2020 11:10:41 +0800
Subject: [PATCH] Merge branch 'master' of https://chonggaoxiao:xcg523511090712@gitee.com/chonggaoxiao/new_excoin.git
---
src/test/java/com/xcong/excoin/ReturnMoneyTest.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/test/java/com/xcong/excoin/ReturnMoneyTest.java b/src/test/java/com/xcong/excoin/ReturnMoneyTest.java
index d002389..e4eeab0 100644
--- a/src/test/java/com/xcong/excoin/ReturnMoneyTest.java
+++ b/src/test/java/com/xcong/excoin/ReturnMoneyTest.java
@@ -56,30 +56,29 @@
if (CollUtil.isNotEmpty(list)) {
for (AgentReturnEntity agentReturn : list) {
BigDecimal needReturn = agentReturn.getReturnAmount();
- Long memberId = agentReturn.getMemberId();
- MemberWalletAgentEntity walletAgent = memberWalletAgentDao.selectWalletAgentBymIdAndCode(memberId, "USDT");
+ Long refererId = agentReturn.getRefererId();
+ MemberWalletAgentEntity walletAgent = memberWalletAgentDao.selectWalletAgentBymIdAndCode(refererId, "USDT");
if (walletAgent == null) {
continue;
}
- log.info("用户ID:{}, 当前余额:{},总金额:{}, 返佣金额:{}", memberId, walletAgent.getAvailableBalance().toPlainString(), walletAgent.getTotalBalance().toPlainString(), needReturn);
+ log.info("用户ID:{}, 当前余额:{},总金额:{}, 返佣金额:{}", refererId, walletAgent.getAvailableBalance().toPlainString(), walletAgent.getTotalBalance().toPlainString(), needReturn);
walletAgent.setAvailableBalance(walletAgent.getAvailableBalance().add(needReturn));
walletAgent.setTotalBalance(walletAgent.getTotalBalance().add(needReturn));
- agentReturn.setIsReturn(AgentReturnEntity.IS_RETURN_Y);
MemberAccountMoneyChange moneyChange = new MemberAccountMoneyChange();
moneyChange.setAmount(needReturn);
moneyChange.setContent("佣金到账");
moneyChange.setType(MemberAccountMoneyChange.TYPE_WALLET_AGENT);
moneyChange.setStatus(MemberAccountMoneyChange.STATUS_SUCCESS_INTEGER);
- moneyChange.setMemberId(memberId);
+ moneyChange.setMemberId(refererId);
moneyChange.setSymbol("USDT");
// // 更新代理钱包金额
// memberWalletAgentDao.updateById(walletAgent);
// // 更新返佣明细中状态
-// agentReturnDao.updateById(agentReturn);
+// agentReturnDao.updateAgentReturnStatusByRefererId(AgentReturnEntity.IS_RETURN_Y, refererId);
// // 插入财务流水记录
// memberAccountMoneyChangeDao.insert(moneyChange);
}
--
Gitblit v1.9.1