From 3ff7b00ee071c913f3187b139e8ad7538c23e46c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 31 Oct 2022 15:35:22 +0800
Subject: [PATCH] 20221021
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 2 +-
src/main/resources/mapper/dapp/DappMemberAddressDao.xml | 1 +
src/main/resources/mapper/dapp/DappBankDao.xml | 1 +
src/main/java/cc/mrbird/febs/dapp/vo/ApiAddressInfoVo.java | 3 +++
src/main/java/cc/mrbird/febs/dapp/vo/ApiBankListVo.java | 3 +++
src/main/resources/templates/febs/views/walletCoin/transferInsideList.html | 4 ++--
6 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
index 2a71bb4..ba9820c 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
@@ -720,7 +720,7 @@
//转出账户生成一条记录
MemberCoinWithdrawEntity memberCoinWithdrawEntity = new MemberCoinWithdrawEntity();
memberCoinWithdrawEntity.setAddress(address);
- memberCoinWithdrawEntity.setAmount(balance.negate());
+ memberCoinWithdrawEntity.setAmount(balance);
memberCoinWithdrawEntity.setFeeAmount(serviceFee);
if(1 == apiTransferOutsideDto.getType()){
memberCoinWithdrawEntity.setTag("银行卡");
diff --git a/src/main/java/cc/mrbird/febs/dapp/vo/ApiAddressInfoVo.java b/src/main/java/cc/mrbird/febs/dapp/vo/ApiAddressInfoVo.java
index a7c3647..38f8ba5 100644
--- a/src/main/java/cc/mrbird/febs/dapp/vo/ApiAddressInfoVo.java
+++ b/src/main/java/cc/mrbird/febs/dapp/vo/ApiAddressInfoVo.java
@@ -13,6 +13,9 @@
@ApiModelProperty(value = "地址")
private String address;
+ @ApiModelProperty(value = "地址（没有隐藏）")
+ private String addressClear;
+
@ApiModelProperty(value = "地址类型")
private String type;
diff --git a/src/main/java/cc/mrbird/febs/dapp/vo/ApiBankListVo.java b/src/main/java/cc/mrbird/febs/dapp/vo/ApiBankListVo.java
index 0f1d806..8de053c 100644
--- a/src/main/java/cc/mrbird/febs/dapp/vo/ApiBankListVo.java
+++ b/src/main/java/cc/mrbird/febs/dapp/vo/ApiBankListVo.java
@@ -14,4 +14,7 @@
@ApiModelProperty(value = "银行卡号")
private String cardCode;
+
+ @ApiModelProperty(value = "银行卡号(不隐藏)")
+ private String cardCodeClear;
}
diff --git a/src/main/resources/mapper/dapp/DappBankDao.xml b/src/main/resources/mapper/dapp/DappBankDao.xml
index df539f5..f2385df 100644
--- a/src/main/resources/mapper/dapp/DappBankDao.xml
+++ b/src/main/resources/mapper/dapp/DappBankDao.xml
@@ -15,6 +15,7 @@
<select id="selectBankListByMemberId" resultType="cc.mrbird.febs.dapp.vo.ApiBankListVo">
select
concat(left(a.card_code,4), '******', right(a.card_code,4)) cardCode,
+ a.card_code cardCodeClear,
a.member_name memberName,
a.id id
from dapp_bank a
diff --git a/src/main/resources/mapper/dapp/DappMemberAddressDao.xml b/src/main/resources/mapper/dapp/DappMemberAddressDao.xml
index 5c4e157..0f4abc0 100644
--- a/src/main/resources/mapper/dapp/DappMemberAddressDao.xml
+++ b/src/main/resources/mapper/dapp/DappMemberAddressDao.xml
@@ -5,6 +5,7 @@
<select id="selectByMemberId" resultType="cc.mrbird.febs.dapp.vo.ApiAddressInfoVo">
select
concat(left(a.address,3), '******', right(a.address,3)) address,
+ a.address addressClear,
a.type type,
a.id id
from dapp_member_address a
diff --git a/src/main/resources/templates/febs/views/walletCoin/transferInsideList.html b/src/main/resources/templates/febs/views/walletCoin/transferInsideList.html
index c7108cb..ba2f288 100644
--- a/src/main/resources/templates/febs/views/walletCoin/transferInsideList.html
+++ b/src/main/resources/templates/febs/views/walletCoin/transferInsideList.html
@@ -1,4 +1,4 @@
-<div class="layui-fluid layui-anim febs-anim" id="febs-member-withDraw" lay-title="用户列表">
+<div class="layui-fluid layui-anim febs-anim" id="febs-member-withDraw" lay-title="列表">
<div class="layui-row febs-container">
<div class="layui-col-md12">
<div class="layui-card">
@@ -148,7 +148,7 @@
if (d.isInside === 'Y') {
return ''
} else if (d.isInside === 'N') {
- return '<span>d.address</span>'
+ return '<span>('+d.tag+')'+d.address+'</span>'
}else{
return ''
}
--
Gitblit v1.9.1