From a7ff00c817968670223bb454617cd43d106d2b8d Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 14 May 2021 20:12:24 +0800
Subject: [PATCH] 20210514 云顶
---
src/main/resources/mapper/modules/BasicSettingMapper.xml | 2
src/main/resources/templates/febs/views/modules/member/member.html | 125 +++++++++++-------------------
src/main/resources/templates/febs/views/modules/yunding/seeAgentReturn.html | 2
src/main/java/com/xcong/excoin/modules/yunding/entity/YdOrderEntity.java | 6
src/main/resources/templates/febs/views/modules/yunding/seeReturn.html | 2
src/main/java/com/xcong/excoin/modules/yunding/vo/YdAgentOrderVo.java | 3
src/main/resources/templates/febs/views/modules/yunding/yundingOrderList.html | 10 --
src/main/resources/templates/febs/views/modules/member/allData/allDataInfo.html | 39 ---------
8 files changed, 56 insertions(+), 133 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/yunding/entity/YdOrderEntity.java b/src/main/java/com/xcong/excoin/modules/yunding/entity/YdOrderEntity.java
index d56384c..e681bda 100644
--- a/src/main/java/com/xcong/excoin/modules/yunding/entity/YdOrderEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/yunding/entity/YdOrderEntity.java
@@ -84,21 +84,21 @@
* 购买日期
*/
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone = "GMT+8")
private Date buyTime;
/**
* 生效日期
*/
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone = "GMT+8")
private Date workTime;
/**
* 终止日期
*/
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone = "GMT+8")
private Date endTime;
@TableField(exist = false)
diff --git a/src/main/java/com/xcong/excoin/modules/yunding/vo/YdAgentOrderVo.java b/src/main/java/com/xcong/excoin/modules/yunding/vo/YdAgentOrderVo.java
index da5c43b..690378f 100644
--- a/src/main/java/com/xcong/excoin/modules/yunding/vo/YdAgentOrderVo.java
+++ b/src/main/java/com/xcong/excoin/modules/yunding/vo/YdAgentOrderVo.java
@@ -36,7 +36,8 @@
private String phone;
private String inviteId;
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+
+ @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone = "GMT+8")
private Date createTime;
}
diff --git a/src/main/resources/mapper/modules/BasicSettingMapper.xml b/src/main/resources/mapper/modules/BasicSettingMapper.xml
index 204ba1e..1f9ac58 100644
--- a/src/main/resources/mapper/modules/BasicSettingMapper.xml
+++ b/src/main/resources/mapper/modules/BasicSettingMapper.xml
@@ -119,6 +119,7 @@
SELECT
b.phone phoneTo,
a.content content,
+ a.create_time createTime,
a.amount amount,
a.symbol symbol,
a.status status,
@@ -151,6 +152,7 @@
a.content content,
a.amount amount,
a.symbol symbol,
+ a.create_time createTime,
a.status status,
b.phone phoneFrom,
d.quantity quantityOrder,
diff --git a/src/main/resources/templates/febs/views/modules/member/allData/allDataInfo.html b/src/main/resources/templates/febs/views/modules/member/allData/allDataInfo.html
index 7b72882..7f6ed7f 100644
--- a/src/main/resources/templates/febs/views/modules/member/allData/allDataInfo.html
+++ b/src/main/resources/templates/febs/views/modules/member/allData/allDataInfo.html
@@ -12,16 +12,6 @@
<input type="text" placeholder="手机号/邮箱/邀请码" name="account" autocomplete="off" class="layui-input">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label layui-form-label-sm">账号类型</label>
- <div class="layui-input-inline">
- <select name="isTest">
- <option value=""></option>
- <option value="1">正常账号</option>
- <option value="2">测试账号</option>
- </select>
- </div>
- </div>
</div>
</div>
<div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
@@ -83,37 +73,9 @@
totalRow: true,
cols: [[
{field: 'memberCount', title: '注册用户数', minWidth: 120,align:'center'},
- {field: 'notNullNumber', title: '持仓用户数', minWidth: 120,align:'center'},
{field: 'walletNumber', title: '币币账户有余额个数', minWidth: 200,align:'center'},
- {field: 'walletNum', title: '币币账户余额', minWidth: 200,align:'center'},
- {field: 'walletCoinNumber', title: '合约账户有余额个数', minWidth: 200,align:'center'},
- {field: 'walletCoinNum', title: '合约账户余额', minWidth: 200,align:'center'},
- {field: 'agentNum', title: '代理账户余额', minWidth: 200,align:'center'},
- {field: 'allCoin', title: '平台总资产', minWidth: 200,align:'center'},
- {field: 'platformProfitAndLoss', title: '平台剩余USDT',
- templet: function (d) {
- if (d.platformProfitAndLoss > '0') {
- return '<span style="color:green;">'+d.platformProfitAndLoss+'</span>'
- } else {
- return '<span style="color:red;">'+d.platformProfitAndLoss+'</span>'
- }
- }, minWidth: 200,align:'center'},
{field: 'chargeCoin', title: '充币', minWidth: 200,align:'center'},
{field: 'appealCoin', title: '提币', minWidth: 200,align:'center'},
- {field: 'fee', title: '佣金', minWidth: 200,align:'center'},
- {field: 'closingPrice', title: '开仓手续费', minWidth: 200,align:'center'},
- {field: 'sellClosingPrice', title: '平仓手续费', minWidth: 200,align:'center'},
- {field: 'doingPrice', title: '持仓手续费', minWidth: 200,align:'center'},
- {field: 'yingkui', title: '订单盈亏',
- templet: function (d) {
- if (d.yingkui > '0') {
- return '<span style="color:green;">'+d.yingkui+'</span>'
- } else {
- return '<span style="color:red;">'+d.yingkui+'</span>'
- }
- }, minWidth: 200,align:'center'},
- {field: 'chargeUsdt', title: 'usdt充值', minWidth: 200,align:'center'},
- {field: 'appealUsdt', title: 'usdt提现', minWidth: 200,align:'center'},
]]
});
}
@@ -122,7 +84,6 @@
function getQueryParams() {
return {
account: $searchForm.find('input[name="account"]').val().trim(),
- isTest: $searchForm.find("select[name='isTest']").val(),
};
}
diff --git a/src/main/resources/templates/febs/views/modules/member/member.html b/src/main/resources/templates/febs/views/modules/member/member.html
index 71a5bea..1099d1d 100644
--- a/src/main/resources/templates/febs/views/modules/member/member.html
+++ b/src/main/resources/templates/febs/views/modules/member/member.html
@@ -12,7 +12,7 @@
<input type="text" placeholder="手机号/邮箱/邀请码" name="account" autocomplete="off" class="layui-input">
</div>
</div>
- <div class="layui-inline">
+ <!--<div class="layui-inline">
<label class="layui-form-label layui-form-label-sm">审核状态</label>
<div class="layui-input-inline">
<select name="certifyStatus">
@@ -22,7 +22,7 @@
<option value="3">未实名</option>
</select>
</div>
- </div>
+ </div>-->
</div>
</div>
<div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
@@ -152,86 +152,55 @@
cols: [[
{field: 'phone', title: '手机号', minWidth: 150,align:'left'},
{field: 'email', title: '邮箱', minWidth: 150,align:'left'},
- {field: 'realName', title: '姓名', minWidth: 100,align:'left'},
- {field: 'inviteId', title: '邀请码UID',
- templet: function (d) {
- return '<a lay-event="examine" shiro:hasPermission="user:update">'+d.inviteId+'</a>'
- }, minWidth: 80,align:'center'},
+ //{field: 'realName', title: '姓名', minWidth: 100,align:'left'},
+ {field: 'inviteId', title: '邀请码UID', minWidth: 80,align:'center'},
{field: 'refererId', title: '上级邀请码UID', minWidth: 80,align:'center'},
- {field: 'accountType', title: '账号类型',
- templet: function (d) {
- if (d.accountType === 2) {
- return '<span style="color:green;">测试账号</span>'
- } else if (d.accountType === 1) {
- return '<span style="color:red;">正常账号</span>'
- }else{
- return ''
- }
- }, minWidth: 80,align:'center'},
- {field: 'accountStatus', title: '账号状态',
- templet: function (d) {
- if (d.accountStatus === 1) {
- return '<span style="color:green;">正常</span>'
- } else if (d.accountStatus === 0) {
- return '<span style="color:red;">禁用</span>'
- }else{
- return ''
- }
- }, minWidth: 80,align:'center'},
- {field: 'certifyStatus', title: '审核状态',
- templet: function (d) {
- if (d.certifyStatus === 0) {
- return '<span style="color:red;">未通过</span>'
- } else if (d.certifyStatus === 1) {
- return '<span style="color:blue;">待审核</span>'
- } else if (d.certifyStatus === 2) {
- return '<span style="color:green;">审核通过</span>'
- } else if (d.certifyStatus === 3) {
- return '<span>未实名</span>'
- }else{
- return ''
- }
- }, minWidth: 80,align:'center'},
- {field: 'pcState', title: '是否可平仓',
- templet: function (d) {
- if (d.pcState === 1) {
- return '<span style="color:#ff0000;">否</span>'
- } else {
- return '<span style="color:green;">是</span>'
- }
- },minWidth: 100,align:'center'},
+ // {field: 'accountType', title: '账号类型',
+ // templet: function (d) {
+ // if (d.accountType === 2) {
+ // return '<span style="color:green;">测试账号</span>'
+ // } else if (d.accountType === 1) {
+ // return '<span style="color:red;">正常账号</span>'
+ // }else{
+ // return ''
+ // }
+ // }, minWidth: 80,align:'center'},
+ // {field: 'accountStatus', title: '账号状态',
+ // templet: function (d) {
+ // if (d.accountStatus === 1) {
+ // return '<span style="color:green;">正常</span>'
+ // } else if (d.accountStatus === 0) {
+ // return '<span style="color:red;">禁用</span>'
+ // }else{
+ // return ''
+ // }
+ // }, minWidth: 80,align:'center'},
+ // {field: 'certifyStatus', title: '审核状态',
+ // templet: function (d) {
+ // if (d.certifyStatus === 0) {
+ // return '<span style="color:red;">未通过</span>'
+ // } else if (d.certifyStatus === 1) {
+ // return '<span style="color:blue;">待审核</span>'
+ // } else if (d.certifyStatus === 2) {
+ // return '<span style="color:green;">审核通过</span>'
+ // } else if (d.certifyStatus === 3) {
+ // return '<span>未实名</span>'
+ // }else{
+ // return ''
+ // }
+ // }, minWidth: 80,align:'center'},
+ // {field: 'pcState', title: '是否可平仓',
+ // templet: function (d) {
+ // if (d.pcState === 1) {
+ // return '<span style="color:#ff0000;">否</span>'
+ // } else {
+ // return '<span style="color:green;">是</span>'
+ // }
+ // },minWidth: 100,align:'center'},
{field: 'createTime', title: '注册时间', minWidth: 180,align:'center'},
{title: '操作',
templet: function (d) {
- if (d.certifyStatus === 1) {
- if(d.pcState === 1){
- return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit" shiro:hasPermission="user:update">审核认证</button>'
- +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="addCoin" shiro:hasPermission="user:update">拨币</button>'
- +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="agree" shiro:hasPermission="user:update">开启</button>'
- }else{
- return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit" shiro:hasPermission="user:update">审核认证</button>'
- +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="addCoin" shiro:hasPermission="user:update">拨币</button>'
- +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="disagree" shiro:hasPermission="user:update">禁止</button>'
- }
- }else if(d.certifyStatus === 2){
- if(d.pcState === 1){
- return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="see" shiro:hasPermission="user:update">查看</button>'
- +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="addCoin" shiro:hasPermission="user:update">拨币</button>'
- +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="agree" shiro:hasPermission="user:update">开启</button>'
- }else{
- return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="see" shiro:hasPermission="user:update">查看</button>'
- +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="addCoin" shiro:hasPermission="user:update">拨币</button>'
- +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="disagree" shiro:hasPermission="user:update">禁止</button>'
- }
- }else {
- if(d.pcState === 1){
- return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="addCoin" shiro:hasPermission="user:update">拨币</button>'
- +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="agree" shiro:hasPermission="user:update">开启</button>'
- }else{
- return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="addCoin" shiro:hasPermission="user:update">拨币</button>'
- +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="disagree" shiro:hasPermission="user:update">禁止</button>'
- }
- }
+ return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="addCoin" shiro:hasPermission="user:update">拨币</button>'
},minWidth: 300,align:'center'}
]]
});
diff --git a/src/main/resources/templates/febs/views/modules/yunding/seeAgentReturn.html b/src/main/resources/templates/febs/views/modules/yunding/seeAgentReturn.html
index c775b21..c803bbb 100644
--- a/src/main/resources/templates/febs/views/modules/yunding/seeAgentReturn.html
+++ b/src/main/resources/templates/febs/views/modules/yunding/seeAgentReturn.html
@@ -59,7 +59,7 @@
{field: 'content', title: '内容', minWidth: 100,align:'left'},
{field: 'amount', title: '金额', minWidth: 100,align:'left'},
{field: 'symbol', title: '币种', minWidth: 80,align:'center'},
- {field: 'status', title: '状态', minWidth: 150,align:'left'},
+ {field: 'createTime', title: '时间', minWidth: 80,align:'center'},
{field: 'phoneTo', title: '接收方', minWidth: 100,align:'left'},
]]
});
diff --git a/src/main/resources/templates/febs/views/modules/yunding/seeReturn.html b/src/main/resources/templates/febs/views/modules/yunding/seeReturn.html
index 3857fb6..5393869 100644
--- a/src/main/resources/templates/febs/views/modules/yunding/seeReturn.html
+++ b/src/main/resources/templates/febs/views/modules/yunding/seeReturn.html
@@ -50,7 +50,7 @@
{field: 'content', title: '内容', minWidth: 100,align:'left'},
{field: 'amount', title: '金额', minWidth: 100,align:'left'},
{field: 'symbol', title: '币种', minWidth: 80,align:'center'},
- {field: 'status', title: '状态', minWidth: 150,align:'left'},
+ {field: 'createTime', title: '时间', minWidth: 80,align:'center'},
]]
});
}
diff --git a/src/main/resources/templates/febs/views/modules/yunding/yundingOrderList.html b/src/main/resources/templates/febs/views/modules/yunding/yundingOrderList.html
index 7503b25..a60d396 100644
--- a/src/main/resources/templates/febs/views/modules/yunding/yundingOrderList.html
+++ b/src/main/resources/templates/febs/views/modules/yunding/yundingOrderList.html
@@ -199,16 +199,6 @@
return ''
}
}, minWidth: 80,align:'center'},
- {field: 'returnType', title: '收益类型',
- templet: function (d) {
- if (d.returnType === 1) {
- return '<span style="color:blue;">USDT</span>'
- } else if (d.returnType === 2) {
- return '<span style="color:green;">XCH</span>'
- }else{
- return ''
- }
- }, minWidth: 80,align:'center'},
{field: 'todayProfit', title: '今日收益', minWidth: 80,align:'center'},
{field: 'state', title: '状态',
templet: function (d) {
--
Gitblit v1.9.1