From 02da4ba4ff00037ad8751f8e767e5c0de97ec98e Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 22 Oct 2022 16:34:12 +0800
Subject: [PATCH] 20221021
---
src/main/java/cc/mrbird/febs/dapp/vo/AdminMemberCoinWithdrawVo.java | 5 +++++
src/main/resources/templates/febs/views/walletCoin/transferInsideList.html | 12 +++++++++++-
src/main/java/cc/mrbird/febs/common/interceptor/LoginInterceptor.java | 2 +-
src/main/resources/mapper/dapp/MemberCoinWithdrawMapper.xml | 4 +++-
4 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/common/interceptor/LoginInterceptor.java b/src/main/java/cc/mrbird/febs/common/interceptor/LoginInterceptor.java
index ffb9849..1a570fa 100644
--- a/src/main/java/cc/mrbird/febs/common/interceptor/LoginInterceptor.java
+++ b/src/main/java/cc/mrbird/febs/common/interceptor/LoginInterceptor.java
@@ -92,7 +92,7 @@
boolean isDebug = false;
if (!isDebug) {
long currentTime = System.currentTimeMillis();
- return currentTime - time <= 30000;
+ return currentTime - time <= 3600000;
}
return true;
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/vo/AdminMemberCoinWithdrawVo.java b/src/main/java/cc/mrbird/febs/dapp/vo/AdminMemberCoinWithdrawVo.java
index abb15a2..f287fcd 100644
--- a/src/main/java/cc/mrbird/febs/dapp/vo/AdminMemberCoinWithdrawVo.java
+++ b/src/main/java/cc/mrbird/febs/dapp/vo/AdminMemberCoinWithdrawVo.java
@@ -50,5 +50,10 @@
* 是否内部转账 Y-是N-不是
*/
private String isInside;
+
+ /**
+ * 收款方
+ */
+ private String usernameIn;
}
diff --git a/src/main/resources/mapper/dapp/MemberCoinWithdrawMapper.xml b/src/main/resources/mapper/dapp/MemberCoinWithdrawMapper.xml
index c771609..0c2ed50 100644
--- a/src/main/resources/mapper/dapp/MemberCoinWithdrawMapper.xml
+++ b/src/main/resources/mapper/dapp/MemberCoinWithdrawMapper.xml
@@ -4,7 +4,9 @@
<select id="findMemberWithdrawCoinInPage" resultType="cc.mrbird.febs.dapp.vo.AdminMemberCoinWithdrawVo">
SELECT
- *
+ s.*,
+ (select a.username from dapp_member a where s.address = a.invite_id and s.is_inside = 'Y') usernameIn,
+ m.username username
FROM
member_coin_withdraw s
left join dapp_member m on m.id = s.member_id
diff --git a/src/main/resources/templates/febs/views/walletCoin/transferInsideList.html b/src/main/resources/templates/febs/views/walletCoin/transferInsideList.html
index 0d7ff2a..b4f6a0f 100644
--- a/src/main/resources/templates/febs/views/walletCoin/transferInsideList.html
+++ b/src/main/resources/templates/febs/views/walletCoin/transferInsideList.html
@@ -116,6 +116,7 @@
totalRow: true,
cols: [[
{field: 'username', title: '用户名', minWidth: 120, align: 'left', totalRowText: '合计'},
+ {field: 'usernameIn', title: '收款方', minWidth: 120, align: 'left'},
{field: 'isInside', title: '类型',
templet: function (d) {
if (d.isInside === 'Y') {
@@ -142,7 +143,16 @@
return ''
}
}, minWidth: 120, align: 'center', totalRow: true},
- {field: 'address', title: '提币地址', minWidth: 300, align: 'center'},
+ {field: 'address', title: '提币地址',
+ templet: function (d) {
+ if (d.isInside === 'Y') {
+ return ''
+ } else if (d.isInside === 'N') {
+ return '<span>d.address</span>'
+ }else{
+ return ''
+ }
+ }, minWidth: 300, align: 'center'},
{field: 'createTime', title: '提币时间', minWidth: 180, align: 'center'},
{title: '操作',
templet: function (d) {
--
Gitblit v1.9.1