From 85c146ad87c70c8919107aafe5f7fb592e776c1b Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Fri, 23 Oct 2020 17:29:40 +0800
Subject: [PATCH] 去掉提币短信，优化自动转币CPV
---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
index 9fb4fda..ac42312 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
@@ -465,7 +465,16 @@
if(status != 1) {
return new FebsResponse().fail().message("只有等待审核的状态才能确认！");
}
-
+ // 转币 需要扣除手续费
+ amount = amount.subtract(selectById.getFeeAmount());
+ if("CPV".equals(symbol) && !"Y".equals(selectById.getIsInside())){
+ // 如果是ROC 则自动转
+ String transfer = RocService.transfer(amount, address, "ROC");
+ if(!"success".equals(transfer)){
+ FebsResponse febsResponse = new FebsResponse();
+ return febsResponse.fail().message(transfer);
+ }
+ }
// 查询币币钱包
MemberWalletCoinEntity walletCoin = memberWalletCoinMapper.findWalletCoinByMemberIdAndWalletCode(memberId, symbol);
@@ -488,8 +497,8 @@
Long aimMemberId = selectByMap.get(0).getMemberId();
MemberWalletCoinEntity aimWalletCoin = memberWalletCoinMapper.findWalletCoinByMemberIdAndWalletCode(aimMemberId, symbol);
- BigDecimal addTotal = aimWalletCoin.getTotalBalance().add(selectById.getAmount());
- BigDecimal addAvailable = aimWalletCoin.getAvailableBalance().add(selectById.getAmount());
+ BigDecimal addTotal = aimWalletCoin.getTotalBalance().add(amount);
+ BigDecimal addAvailable = aimWalletCoin.getAvailableBalance().add(amount);
aimWalletCoin.setTotalBalance(addTotal);
aimWalletCoin.setAvailableBalance(addAvailable);
@@ -498,7 +507,7 @@
MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity = new MemberAccountMoneyChangeEntity();
memberAccountMoneyChangeEntity.setContent("收款");
memberAccountMoneyChangeEntity.setMemberId(aimMemberId);
- memberAccountMoneyChangeEntity.setAmount(selectById.getAmount());
+ memberAccountMoneyChangeEntity.setAmount(amount);
memberAccountMoneyChangeEntity.setStatus(MemberAccountMoneyChangeEntity.STATUS_SUCCESS_INTEGER);
memberAccountMoneyChangeEntity.setSymbol(selectById.getSymbol());
memberAccountMoneyChangeEntity.setType(MemberAccountMoneyChangeEntity.TYPE_WALLET_COIN);
@@ -527,11 +536,10 @@
String time = format.format(new Date()); // 将当前时间袼式化为指定的格式
log.info("---->{}", phone);
- amount = amount.subtract(selectById.getFeeAmount());
- if("CPV".equals(symbol) && !"Y".equals(selectById.getIsInside())){
- // 如果是ROC 则自动转
- String transfer = RocService.transfer(amount, address, "CPV");
- }else if("USDT".equals(symbol) && !"Y".equals(selectById.getIsInside())){
+ if(StrUtil.isNotBlank(phone)) {
+ Sms106Send.sendWithdrawalCoinMsg(phone, time);
+ }
+ if("USDT".equals(symbol) && !"Y".equals(selectById.getIsInside())){
// EthService ethService = new EthService();
// // 查询余额是否足够
// BigDecimal bigDecimal = ethService.tokenGetBalance(EthService.TOTAL_ADDRESS);
@@ -546,9 +554,6 @@
// usdtStr = usdtStr.substring(0, usdtStr.lastIndexOf("."));
// }
// String s = ethService.tokenSend(address, usdtStr, null);
- }
- if(StrUtil.isNotBlank(phone)) {
- Sms106Send.sendWithdrawalCoinMsg(phone, time);
}
/**
--
Gitblit v1.9.1