From 616515dcc94aa6f1259945d77c31cb5c5994eeeb Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Sun, 04 Feb 2024 11:33:09 +0800
Subject: [PATCH] 确认收货更新用户的会员信息
---
src/main/resources/templates/febs/views/modules/news/productNFTAdd.html | 8 ++--
src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html | 36 +++++++++---------
src/main/resources/templates/febs/views/modules/news/productSellList.html | 6 +-
src/main/java/cc/mrbird/febs/rabbit/producter/AgentProducer.java | 2
src/main/resources/templates/febs/views/modules/news/productNFTList.html | 4 +-
src/main/resources/templates/febs/views/modules/news/gfaBasicSet.html | 18 ++++----
src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html | 18 ++++----
7 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/rabbit/producter/AgentProducer.java b/src/main/java/cc/mrbird/febs/rabbit/producter/AgentProducer.java
index a9b4df7..a02c71b 100644
--- a/src/main/java/cc/mrbird/febs/rabbit/producter/AgentProducer.java
+++ b/src/main/java/cc/mrbird/febs/rabbit/producter/AgentProducer.java
@@ -65,7 +65,7 @@
/**
* 匹配成功，有一个倒计时，超时后
* 匹配成功2小时内不打款或收到款不确认的自动冻结帐户，但可以登陆，
- * 会员解封号自己可以解冻或找上级解冻帐户，解冻需要消毁相应代币FCM，
+ * 会员解封号自己可以解冻或找上级解冻帐户，解冻需要消毁相应代币GFA，
* 封号期间该帐户不产生团队奖金。
* 中途如有问题可以点申诉，留言与客服交流窗口，后台可以核实和查询
* @param id
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
index edfb863..54ea3be 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
@@ -139,9 +139,9 @@
<div class="layui-btn-container">
<!-- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="exportMember">导出会员信息</button>-->
<button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="addMember:update" lay-event="registMember">添加会员</button>
- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="mallSystemPay:update" lay-event="balance">拨付动态NFT</button>
+ <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="mallSystemPay:update" lay-event="balance">拨付动态卡牌</button>
<button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="mallSystemPay:update" lay-event="score">拨付代币可用</button>
- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="mallSystemPay:update" lay-event="prizeScore">拨付令牌可用</button>
+ <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="mallSystemPay:update" lay-event="prizeScore">拨付宝石可用</button>
<button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="resetPwd:update" lay-event="resetPwd">重置登录密码</button>
<button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="resetPwd:update" lay-event="resetPayPwd">重置支付密码</button>
<!-- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="agentLevelSet:update" lay-event="agentLevel">设置代理等级</button>-->
@@ -318,13 +318,13 @@
{field: 'accountLogin', title: '登录账户', minWidth: 150,align:'left'},
{field: 'inviteId', title: '邀请码', minWidth: 100,align:'left'},
{field: 'referrerName', title: '推荐人', minWidth: 100,align:'left'},
- {field: 'staticNft', title: '静态NFT', minWidth: 120,align:'left'},
- {field: 'trendsNft', title: '动态NFT', minWidth: 120,align:'left'},
- {field: 'frozenNft', title: '冻结NFT', minWidth: 120,align:'left'},
+ {field: 'staticNft', title: '静态卡牌', minWidth: 120,align:'left'},
+ {field: 'trendsNft', title: '动态卡牌', minWidth: 120,align:'left'},
+ {field: 'frozenNft', title: '冻结卡牌', minWidth: 120,align:'left'},
{field: 'fcmCntAva', title: '代币可用', minWidth: 120,align:'left'},
{field: 'fcmCntFrozen', title: '代币冻结', minWidth: 120,align:'left'},
- {field: 'tokenAva', title: '门票可用', minWidth: 120,align:'left'},
- {field: 'tokenFrozen', title: '门票冻结', minWidth: 120,align:'left'},
+ {field: 'tokenAva', title: '宝石可用', minWidth: 120,align:'left'},
+ {field: 'tokenFrozen', title: '宝石冻结', minWidth: 120,align:'left'},
// {field: 'levelName', title: '会员类型', minWidth: 100,align:'left'},
// {field: 'storeMaster', title: '线下服务中心', templet:'#switchStoreMaster', minWidth: 120,align:'left',hide:toolbarMallmember},
// {field: 'director', title: '代理商', templet:'#switchDirector', minWidth: 120,align:'left' ,hide:toolbarMallmember},
@@ -428,7 +428,7 @@
febs.alert.warn('只能选择一个用户');
return;
}
- systemPay("动态NFT", checkData[0].id, 1);
+ systemPay("动态卡牌", checkData[0].id, 1);
}
if (layEvent === 'voucherUpdate') {
@@ -467,7 +467,7 @@
febs.alert.warn('请选择一个用户');
return;
}
- systemPay("门票可用", checkData[0].id, 3);
+ systemPay("宝石可用", checkData[0].id, 3);
}
if (layEvent === 'agentLevel') {
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
index d09f07e..92dafb1 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
@@ -21,17 +21,17 @@
<option value="1">解除冻结</option>
<option value="2">代币转出</option>
<option value="3">代币转入</option>
- <option value="4">门票转出</option>
- <option value="5">门票转入</option>
- <option value="6">预约冻结门票</option>
+ <option value="4">宝石转出</option>
+ <option value="5">宝石转入</option>
+ <option value="6">预约冻结宝石</option>
<option value="7">GFA动态兑换</option>
<option value="8">动态兑换手续费</option>
<option value="9">GFA动态兑换</option>
- <option value="10">NFT提现</option>
- <option value="11">NFT提现手续费</option>
+ <option value="10">卡牌提现</option>
+ <option value="11">卡牌提现手续费</option>
<option value="12">支付</option>
- <option value="13">预约门票</option>
- <option value="14">NFT提现GFA手续费</option>
+ <option value="13">预约宝石</option>
+ <option value="14">卡牌提现GFA手续费</option>
<option value="15">系统拨付</option>
</select>
</div>
@@ -41,8 +41,8 @@
<div class="layui-input-inline">
<select name="flowType">
<option value="">请选择</option>
- <option value="3">NFT</option>
- <option value="2">门票</option>
+ <option value="3">卡牌</option>
+ <option value="2">宝石</option>
<option value="1">GFA代币</option>
</select>
</div>
@@ -70,9 +70,9 @@
{{# if(d.flowType === 1) { }}
<span class="layui-badge febs-bg-red">GFA代币</span>
{{# } else if(d.flowType === 2) { }}
- <span class="layui-badge febs-bg-blue">门票</span>
+ <span class="layui-badge febs-bg-blue">宝石</span>
{{# } else if(d.flowType === 3) { }}
- <span class="layui-badge febs-bg-orange">NFT</span>
+ <span class="layui-badge febs-bg-orange">卡牌</span>
{{# } else { }}
{{# } }}
</script>
@@ -85,11 +85,11 @@
{{# } else if(d.type === 3) { }}
<span class="layui-badge febs-bg-orange">代币转入</span>
{{# } else if(d.type === 4) { }}
- <span class="layui-badge febs-bg-orange">门票转出</span>
+ <span class="layui-badge febs-bg-orange">宝石转出</span>
{{# } else if(d.type === 5) { }}
- <span class="layui-badge febs-bg-orange">门票转入</span>
+ <span class="layui-badge febs-bg-orange">宝石转入</span>
{{# } else if(d.type === 6) { }}
- <span class="layui-badge febs-bg-orange">预约冻结门票</span>
+ <span class="layui-badge febs-bg-orange">预约冻结宝石</span>
{{# } else if(d.type === 7) { }}
<span class="layui-badge febs-bg-orange">GFA动态兑换</span>
{{# } else if(d.type === 8) { }}
@@ -97,15 +97,15 @@
{{# } else if(d.type === 9) { }}
<span class="layui-badge febs-bg-orange">GFA动态兑换</span>
{{# } else if(d.type === 10) { }}
- <span class="layui-badge febs-bg-orange">NFT提现</span>
+ <span class="layui-badge febs-bg-orange">卡牌提现</span>
{{# } else if(d.type === 11) { }}
- <span class="layui-badge febs-bg-orange">NFT提现手续费</span>
+ <span class="layui-badge febs-bg-orange">卡牌提现手续费</span>
{{# } else if(d.type === 12) { }}
<span class="layui-badge febs-bg-orange">支付</span>
{{# } else if(d.type === 13) { }}
- <span class="layui-badge febs-bg-orange">预约门票</span>
+ <span class="layui-badge febs-bg-orange">预约宝石</span>
{{# } else if(d.type === 14) { }}
- <span class="layui-badge febs-bg-orange">NFT提现GFA手续费</span>
+ <span class="layui-badge febs-bg-orange">卡牌提现GFA手续费</span>
{{# } else if(d.type === 15) { }}
<span class="layui-badge febs-bg-orange">系统拨付</span>
{{# } else { }}
diff --git a/src/main/resources/templates/febs/views/modules/news/gfaBasicSet.html b/src/main/resources/templates/febs/views/modules/news/gfaBasicSet.html
index a325f7e..28f33e0 100644
--- a/src/main/resources/templates/febs/views/modules/news/gfaBasicSet.html
+++ b/src/main/resources/templates/febs/views/modules/news/gfaBasicSet.html
@@ -32,7 +32,7 @@
<blockquote class="layui-elem-quote blue-border">基本设置</blockquote>
<div class="layui-form-item">
<div class="layui-col-lg6">
- <label class="layui-form-label febs-form-item-require">FCM价格：</label>
+ <label class="layui-form-label febs-form-item-require">GFA价格：</label>
<div class="layui-input-block">
<input type="text" name="fcmPrice" class="layui-input" readonly>
</div>
@@ -41,31 +41,31 @@
<label class="layui-form-label febs-form-item-require">解除冻结：</label>
<div class="layui-input-block">
<input type="text" name="frozenFcmCnt" class="layui-input" readonly>
- <div class="layui-form-mid layui-word-aux">账号解除冻结，需要扣除FCM代币数量</div>
+ <div class="layui-form-mid layui-word-aux">账号解除冻结，需要扣除GFA代币数量</div>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-col-lg6">
- <label class="layui-form-label febs-form-item-require">FCM销毁：</label>
+ <label class="layui-form-label febs-form-item-require">GFA销毁：</label>
<div class="layui-input-block">
<input type="text" name="fcmDesToryCnt" class="layui-input" readonly>
- <div class="layui-form-mid layui-word-aux">FCM销毁数，累计10000，清零重新累计</div>
+ <div class="layui-form-mid layui-word-aux">GFA销毁数，累计10000，清零重新累计</div>
</div>
</div>
<div class="layui-col-lg6">
- <label class="layui-form-label febs-form-item-require">FCM总销毁：</label>
+ <label class="layui-form-label febs-form-item-require">GFA总销毁：</label>
<div class="layui-input-block">
<input type="text" name="fcmDesToryTotal" class="layui-input" readonly>
- <div class="layui-form-mid layui-word-aux">FCM销毁总数</div>
+ <div class="layui-form-mid layui-word-aux">GFA销毁总数</div>
</div>
</div>
</div>
- <blockquote class="layui-elem-quote blue-border">FCM手续费设置</blockquote>
+ <blockquote class="layui-elem-quote blue-border">GFA手续费设置</blockquote>
<div class="layui-form-item">
<div class="layui-col-lg6">
- <label class="layui-form-label febs-form-item-require">FCM手续费：</label>
+ <label class="layui-form-label febs-form-item-require">GFA手续费：</label>
<div class="layui-input-block">
<input type="text" name="outFcmFee" class="layui-input" >
<div class="layui-form-mid layui-word-aux">手续费：20代表20%</div>
@@ -75,7 +75,7 @@
<label class="layui-form-label febs-form-item-require">最小数量：</label>
<div class="layui-input-block">
<input type="text" name="outFcmMin" class="layui-input" >
- <div class="layui-form-mid layui-word-aux">FCM最小提现数量</div>
+ <div class="layui-form-mid layui-word-aux">GFA最小提现数量</div>
</div>
</div>
</div>
diff --git a/src/main/resources/templates/febs/views/modules/news/productNFTAdd.html b/src/main/resources/templates/febs/views/modules/news/productNFTAdd.html
index 6aa481d..823ca5b 100644
--- a/src/main/resources/templates/febs/views/modules/news/productNFTAdd.html
+++ b/src/main/resources/templates/febs/views/modules/news/productNFTAdd.html
@@ -32,17 +32,17 @@
</div>
<div class="layui-row layui-col-space10 layui-form-item">
<div class="layui-col-lg6">
- <label class="layui-form-label febs-form-item-require">NFT：</label>
+ <label class="layui-form-label febs-form-item-require">卡牌：</label>
<div class="layui-input-block">
<input type="text" name="priceNft" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">
- <div class="layui-form-mid layui-word-aux">需要NFT数量</div>
+ <div class="layui-form-mid layui-word-aux">需要卡牌数量</div>
</div>
</div>
<div class="layui-col-lg6">
- <label class="layui-form-label febs-form-item-require">TOKEN：</label>
+ <label class="layui-form-label febs-form-item-require">宝石：</label>
<div class="layui-input-block">
<input type="text" name="priceToken" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">
- <div class="layui-form-mid layui-word-aux">需要token数量</div>
+ <div class="layui-form-mid layui-word-aux">需要宝石数量</div>
</div>
</div>
</div>
diff --git a/src/main/resources/templates/febs/views/modules/news/productNFTList.html b/src/main/resources/templates/febs/views/modules/news/productNFTList.html
index 40f8c83..7eb5680 100644
--- a/src/main/resources/templates/febs/views/modules/news/productNFTList.html
+++ b/src/main/resources/templates/febs/views/modules/news/productNFTList.html
@@ -129,8 +129,8 @@
url: ctx + 'admin/news/getProductNFTList',
cols: [[
{field: 'nftCode', title: '编码', minWidth: 120,align:'center'},
- {field: 'priceNft', title: 'NFT', minWidth: 120,align:'center'},
- {field: 'priceToken', title: 'TOKEN', minWidth: 120,align:'center'},
+ {field: 'priceNft', title: '卡牌', minWidth: 120,align:'center'},
+ {field: 'priceToken', title: '宝石', minWidth: 120,align:'center'},
{field: 'profit', title: '收益(%)', minWidth: 120,align:'center'},
{field: 'cycle', title: '周期(天)', minWidth: 120,align:'center'},
{field: 'memberCnt', title: '预约总数', minWidth: 120,align:'center'},
diff --git a/src/main/resources/templates/febs/views/modules/news/productSellList.html b/src/main/resources/templates/febs/views/modules/news/productSellList.html
index 1f785b5..429257f 100644
--- a/src/main/resources/templates/febs/views/modules/news/productSellList.html
+++ b/src/main/resources/templates/febs/views/modules/news/productSellList.html
@@ -1,4 +1,4 @@
-<div class="layui-fluid layui-anim febs-anim" id="febs-product-sell" lay-title="用户NFT提现">
+<div class="layui-fluid layui-anim febs-anim" id="febs-product-sell" lay-title="用户卡牌提现">
<div class="layui-row febs-container">
<div class="layui-col-md12">
<div class="layui-card">
@@ -145,10 +145,10 @@
cols: [[
{field: 'accountLogin', title: '登录账户', minWidth: 120,align:'center'},
{field: 'orderNo', title: '编号', minWidth: 220,align:'center'},
- {field: 'nftTotal', title: '动态NFT', minWidth: 120,align:'center'},
+ {field: 'nftTotal', title: '动态卡牌', minWidth: 120,align:'center'},
{field: 'nftCnt', title: '实际提现', minWidth: 120,align:'center'},
{field: 'nftCntAva', title: '剩余数量', minWidth: 120,align:'center'},
- {field: 'nftFee', title: 'NFT手续费', minWidth: 120,align:'center'},
+ {field: 'nftFee', title: '卡牌手续费', minWidth: 120,align:'center'},
{field: 'fcmFee', title: '代币手续费', minWidth: 120,align:'center'},
{templet: '#isSellState', title: '提现状态', minWidth: 120,align:'center'},
// {title: '操作',
--
Gitblit v1.9.1