From 5b871d4e40d9467ceaeb10a039f33b59711f7c8f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 06 Jul 2020 20:03:43 +0800
Subject: [PATCH] modify
---
src/main/resources/mapper/member/MemberWalletCoinDao.xml | 2 +-
src/main/java/com/xcong/excoin/modules/coin/service/impl/BlockCoinServiceImpl.java | 10 +++++-----
src/main/java/com/xcong/excoin/modules/member/dao/MemberWalletCoinDao.java | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/coin/service/impl/BlockCoinServiceImpl.java b/src/main/java/com/xcong/excoin/modules/coin/service/impl/BlockCoinServiceImpl.java
index 5ed9ee2..648e846 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/service/impl/BlockCoinServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/service/impl/BlockCoinServiceImpl.java
@@ -52,7 +52,7 @@
String address = addressEntity.getAddress();
Long memberId = addressEntity.getMemberId();
- if (StrUtil.isNotBlank(address)) {
+ if (StrUtil.isBlank(address)) {
continue;
}
@@ -76,7 +76,7 @@
if (balance.compareTo(early) > 0) {
BigDecimal newBalance = balance.subtract(early);
- memberWalletCoinDao.updateBlockBalance(memberId, newBalance, balance, 0);
+ memberWalletCoinDao.updateBlockBalance(walletCoinEntity.getId(), newBalance, balance, 0);
insertCoinCharge(address, memberId, newBalance, CoinTypeEnum.USDT.name(), "ERC20", balance);
// TODO 钉钉发送, 短信提醒
@@ -117,7 +117,7 @@
log.info("#ETH更新:{},{},{}#", memberId, balance, early);
BigDecimal newBalance = balance.subtract(early);
- memberWalletCoinDao.updateBlockBalance(memberId, newBalance, balance, 0);
+ memberWalletCoinDao.updateBlockBalance(walletCoin.getId(), newBalance, balance, 0);
insertCoinCharge(address, memberId, newBalance, CoinTypeEnum.ETH.name(), null, balance);
// 插入财务记录
@@ -159,7 +159,7 @@
if (balance.compareTo(early) > 0) {
BigDecimal newBalance = balance.subtract(early);
- memberWalletCoinDao.updateBlockBalance(memberId, newBalance, balance, 0);
+ memberWalletCoinDao.updateBlockBalance(walletCoin.getId(), newBalance, balance, 0);
insertCoinCharge(address, memberId, newBalance, CoinTypeEnum.USDT.name(), "OMNI", balance);
// TODO 钉钉消息, 短信提醒
@@ -199,7 +199,7 @@
if (balance.compareTo(early) > 0) {
log.info("#btc同步:{}, {}, {}#", memberId, balance, early);
BigDecimal newBalance = balance.subtract(early);
- memberWalletCoinDao.updateBlockBalance(memberId, newBalance, balance, 0);
+ memberWalletCoinDao.updateBlockBalance(walletCoin.getId(), newBalance, balance, 0);
insertCoinCharge(address, memberId, newBalance, CoinTypeEnum.BTC.name(), null, balance);
LogRecordUtils.insertMemberAccountMoneyChange(memberId, "转入", newBalance, CoinTypeEnum.BTC.name(), 1, 1);
diff --git a/src/main/java/com/xcong/excoin/modules/member/dao/MemberWalletCoinDao.java b/src/main/java/com/xcong/excoin/modules/member/dao/MemberWalletCoinDao.java
index eb12551..66a50dc 100644
--- a/src/main/java/com/xcong/excoin/modules/member/dao/MemberWalletCoinDao.java
+++ b/src/main/java/com/xcong/excoin/modules/member/dao/MemberWalletCoinDao.java
@@ -21,5 +21,5 @@
int subFrozenBalance(@Param("memberId") Long memberId, @Param("id") Long id, @Param("amount") BigDecimal amount);
- int updateBlockBalance(@Param("memberId") Long memberId, @Param("availableBalance") BigDecimal availableBalance, @Param("earlyBalance") BigDecimal earlyBalance, @Param("blockNumber") Integer blockNumber);
+ int updateBlockBalance(@Param("id") Long id, @Param("availableBalance") BigDecimal availableBalance, @Param("earlyBalance") BigDecimal earlyBalance, @Param("blockNumber") Integer blockNumber);
}
diff --git a/src/main/resources/mapper/member/MemberWalletCoinDao.xml b/src/main/resources/mapper/member/MemberWalletCoinDao.xml
index 4cc7717..79979c5 100644
--- a/src/main/resources/mapper/member/MemberWalletCoinDao.xml
+++ b/src/main/resources/mapper/member/MemberWalletCoinDao.xml
@@ -36,7 +36,7 @@
total_balance = IFNULL(total_balance, 0) + #{availableBalance},
early_balance = IFNULL(early_balance, 0) + #{earlyBalance},
block_number = IFNULL(block_number, 0) + #{blockNumber}
- where id=#{memberId}
+ where id=#{id}
</update>
--
Gitblit v1.9.1