From 32be57749006b37eab59916bb5c9823211320df9 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 30 Nov 2020 17:23:30 +0800
Subject: [PATCH] 20201130
---
src/main/java/com/xcong/excoin/modules/trademanage/entity/OrderCoinsDealEntity.java | 1
src/main/resources/templates/febs/views/modules/member/withdrawCoin.html | 20 +++------
src/main/resources/templates/febs/views/modules/member/member.html | 51 ++++++++++---------------
src/main/resources/templates/febs/views/modules/member/applyCoin.html | 8 ++--
src/main/resources/templates/febs/views/modules/orderCoin/orderCoin.html | 9 ++--
src/main/resources/mapper/modules/OrderCoinDealMapper.xml | 6 +-
src/main/resources/application-dev.yml | 6 +-
src/main/resources/application-prod.yml | 10 ++--
src/main/resources/application-test.yml | 8 ++--
9 files changed, 52 insertions(+), 67 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/trademanage/entity/OrderCoinsDealEntity.java b/src/main/java/com/xcong/excoin/modules/trademanage/entity/OrderCoinsDealEntity.java
index 5508bb1..262a880 100644
--- a/src/main/java/com/xcong/excoin/modules/trademanage/entity/OrderCoinsDealEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/trademanage/entity/OrderCoinsDealEntity.java
@@ -77,6 +77,7 @@
private String phone;
private String email;
+ private String inviteId;
private Integer ipo;
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 70f014a..a15018e 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -18,17 +18,17 @@
username: ct_test
password: 123456
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://120.27.238.55:3306/kss_framework?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
+ url: jdbc:mysql://120.27.238.55:3306/outcenter_test?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
redis:
# Redis数据库索引（默认为 0）
database: 1
# Redis服务器地址
- host: 47.114.114.219
+ host: 120.27.238.55
# Redis服务器连接端口
port: 6379
# Redis 密码
- password: biyi123
+ password: xcong123
lettuce:
pool:
# 连接池中的最小空闲连接
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index ea825e7..fd070a6 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -15,20 +15,20 @@
datasource:
# 数据源-1，名称为 base
base:
- username: roc_user
- password: roc123pasd!@
+ username: ct_test
+ password: 123456
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://rm-bp1i2g5rg5dubo9s40o.mysql.rds.aliyuncs.com:3306/db_roc?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
+ url: jdbc:mysql://120.27.238.55:3306/outcenter_test?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
redis:
# Redis数据库索引（默认为 0）
database: 1
# Redis服务器地址
- host: 47.114.114.219
+ host: 120.27.238.55
# Redis服务器连接端口
port: 6379
# Redis 密码
- password: roccqwe1234
+ password: xcong123
lettuce:
pool:
# 连接池中的最小空闲连接
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 1a1242b..fd070a6 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -15,20 +15,20 @@
datasource:
# 数据源-1，名称为 base
base:
- username: shop_user
+ username: ct_test
password: 123456
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://47.96.73.250:3306/db_roc?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
+ url: jdbc:mysql://120.27.238.55:3306/outcenter_test?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
redis:
# Redis数据库索引（默认为 0）
database: 1
# Redis服务器地址
- host: 47.96.73.250
+ host: 120.27.238.55
# Redis服务器连接端口
port: 6379
# Redis 密码
- password: qwer12345678
+ password: xcong123
lettuce:
pool:
# 连接池中的最小空闲连接
diff --git a/src/main/resources/mapper/modules/OrderCoinDealMapper.xml b/src/main/resources/mapper/modules/OrderCoinDealMapper.xml
index 98982d7..1905290 100644
--- a/src/main/resources/mapper/modules/OrderCoinDealMapper.xml
+++ b/src/main/resources/mapper/modules/OrderCoinDealMapper.xml
@@ -4,15 +4,15 @@
<select id="selectOrderCoinsDealListInPage" resultType="com.xcong.excoin.modules.trademanage.entity.OrderCoinsDealEntity">
SELECT
- s.*,m.phone,m.email,m.ipo
+ s.*,m.phone,m.invite_id,m.email,m.ipo
FROM
coins_order_deal s
LEFT JOIN member m ON m.id = s.member_id
<where>
s.order_status = 3
<if test="record != null" >
- <if test="record.phone!=null and record.phone!=''">
- and (m.phone like concat("%",#{record.phone},"%") or m.email like concat("%",#{record.phone},"%") or m.invite_id=#{record.phone})
+ <if test="record.inviteId!=null and record.inviteId!=''">
+ and ( m.invite_id=#{record.inviteId})
</if>
</if>
</where>
diff --git a/src/main/resources/templates/febs/views/modules/member/applyCoin.html b/src/main/resources/templates/febs/views/modules/member/applyCoin.html
index edf94db..37236cf 100644
--- a/src/main/resources/templates/febs/views/modules/member/applyCoin.html
+++ b/src/main/resources/templates/febs/views/modules/member/applyCoin.html
@@ -9,7 +9,7 @@
<div class="layui-form-item">
<div class="layui-inline">
<div class="layui-input-inline">
- <input type="text" placeholder="手机号/邮箱/邀请码" name="account" autocomplete="off" class="layui-input">
+ <input type="text" placeholder="邀请码" name="account" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
@@ -96,9 +96,9 @@
url: ctx + 'member/memberApplyCoin',
totalRow: true,
cols: [[
- {field: 'phone', title: '手机号码', minWidth: 120,align:'left',totalRowText: '合计'},
- {field: 'realName', title: '姓名', minWidth: 120,align:'left'},
- {field: 'email', title: '邮箱', minWidth: 100,align:'left'},
+ //{field: 'phone', title: '手机号码', minWidth: 120,align:'left',totalRowText: '合计'},
+ //{field: 'realName', title: '姓名', minWidth: 120,align:'left'},
+ //{field: 'email', title: '邮箱', minWidth: 100,align:'left'},
{field: 'inviteId', title: '邀请码UID', minWidth: 80,align:'center'},
{field: 'symbol', title: '币种', minWidth: 100,align:'center'},
{field: 'amount', title: '充币数量', minWidth: 100,align:'center',totalRow: true},
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 1ef52d1..9a17510 100644
--- a/src/main/resources/templates/febs/views/modules/member/member.html
+++ b/src/main/resources/templates/febs/views/modules/member/member.html
@@ -9,18 +9,7 @@
<div class="layui-form-item">
<div class="layui-inline">
<div class="layui-input-inline">
- <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="certifyStatus">
- <option value="">请选择</option>
- <option value="1">待审核</option>
- <option value="2">审核通过</option>
- <option value="3">未实名</option>
- </select>
+ <input type="text" placeholder="邀请码" name="account" autocomplete="off" class="layui-input">
</div>
</div>
</div>
@@ -127,9 +116,9 @@
id: 'userTable',
url: ctx + 'member/getList',
cols: [[
- {field: 'phone', title: '手机号', minWidth: 120,align:'left'},
- {field: 'email', title: '邮箱', minWidth: 50,align:'left'},
- {field: 'realName', title: '姓名', minWidth: 50,align:'left'},
+ //{field: 'phone', title: '手机号', minWidth: 120,align:'left'},
+ //{field: 'email', title: '邮箱', minWidth: 50,align:'left'},
+ //{field: 'realName', title: '姓名', minWidth: 50,align:'left'},
{field: 'inviteId', title: '邀请码UID',
templet: function (d) {
return '<a lay-event="examine" shiro:hasPermission="user:update">'+d.inviteId+'</a>'
@@ -166,22 +155,22 @@
return '<span style="color:gray;">否</span>'
}
}, minWidth: 80,align:'center'},
- {field: 'refererId', 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: 'refererId', 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: 'createTime', title: '注册时间', minWidth: 150,align:'center'},
- {title: '操作', toolbar: '#user-option'
+ // {title: '操作', toolbar: '#user-option'
// templet: function (d) {
// if (d.certifyStatus === 1) {
// return ''
@@ -191,7 +180,7 @@
// +'<i class="layui-icon febs-edit-area febs-blue"></i></a>'
// }
// },
- ,minWidth: 200,align:'center'}
+ // ,minWidth: 200,align:'center'}
]]
});
}
diff --git a/src/main/resources/templates/febs/views/modules/member/withdrawCoin.html b/src/main/resources/templates/febs/views/modules/member/withdrawCoin.html
index 3039741..6a721da 100644
--- a/src/main/resources/templates/febs/views/modules/member/withdrawCoin.html
+++ b/src/main/resources/templates/febs/views/modules/member/withdrawCoin.html
@@ -9,15 +9,10 @@
<div class="layui-form-item">
<div class="layui-inline">
<div class="layui-input-inline">
- <input type="text" placeholder="手机号/邮箱/邀请码" name="account" autocomplete="off" class="layui-input">
+ <input type="text" placeholder="邀请码" name="account" autocomplete="off" class="layui-input">
</div>
</div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input type="text" placeholder="收款手机号" name="insidePhone" autocomplete="off" class="layui-input">
- </div>
- </div>
<div class="layui-inline">
<div class="layui-input-inline">
<input type="text" placeholder="提币地址" name="address" autocomplete="off" class="layui-input">
@@ -150,9 +145,9 @@
url: ctx + 'member/memberWithdrawCoin',
totalRow: true,
cols: [[
- {field: 'phone', title: '手机号码', minWidth: 120,align:'left',totalRowText: '合计'},
- {field: 'realName', title: '姓名', minWidth: 50,align:'left'},
- {field: 'email', title: '邮箱', minWidth: 100,align:'left'},
+ // {field: 'phone', title: '手机号码', minWidth: 120,align:'left',totalRowText: '合计'},
+ //{field: 'realName', title: '姓名', minWidth: 50,align:'left'},
+ // {field: 'email', title: '邮箱', minWidth: 100,align:'left'},
// {field: 'accountType', title: '账号类型',
// templet: function (d) {
// if (d.accountType === 2) {
@@ -173,7 +168,7 @@
return '<span style="color:green;">否</span>'
}
},minWidth: 100,align:'center'},
- {field: 'insidePhone', title: '内部账户', minWidth: 120,align:'center' },
+ // {field: 'insidePhone', title: '内部账户', minWidth: 120,align:'center' },
{field: 'amount', title: '提币数量', minWidth: 120,align:'center' ,totalRow: true},
{field: 'realAmount', title: '到账金额', minWidth: 120,align:'center' ,totalRow: true},
{field: 'address', title: '提币地址', minWidth: 300,align:'center'},
@@ -189,7 +184,7 @@
return '<span style="color:red;">拒绝</span>'
}
},minWidth: 100,align:'center'},
- {title: '操作', toolbar: '#user-option'
+ // {title: '操作', toolbar: '#user-option'
// templet: function (d) {
// if (d.status === 1) {
// return '<a lay-event="confirm" shiro:hasPermission="coin:check">确认</a>'
@@ -200,7 +195,7 @@
// return '<a lay-event="examine" >查看</a>'
// }
// }
- ,minWidth: 200,align:'center'}
+ // ,minWidth: 200,align:'center'}
]]
});
}
@@ -209,7 +204,6 @@
function getQueryParams() {
return {
account: $searchForm.find('input[name="account"]').val().trim(),
- insidePhone: $searchForm.find('input[name="insidePhone"]').val().trim(),
address: $searchForm.find('input[name="address"]').val().trim(),
status: $searchForm.find("select[name='statusOption']").val(),
isTest: $searchForm.find("select[name='isTest']").val(),
diff --git a/src/main/resources/templates/febs/views/modules/orderCoin/orderCoin.html b/src/main/resources/templates/febs/views/modules/orderCoin/orderCoin.html
index 3a48a34..49bcfa8 100644
--- a/src/main/resources/templates/febs/views/modules/orderCoin/orderCoin.html
+++ b/src/main/resources/templates/febs/views/modules/orderCoin/orderCoin.html
@@ -9,7 +9,7 @@
<div class="layui-form-item">
<div class="layui-inline">
<div class="layui-input-inline">
- <input type="text" placeholder="手机号/邮箱" name="phone" autocomplete="off" class="layui-input">
+ <input type="text" placeholder="邀请码" name="inviteId" autocomplete="off" class="layui-input">
</div>
</div>
</div>
@@ -81,8 +81,9 @@
url: ctx + 'orderCoin/page',
totalRow: true,
cols: [[
- {field: 'phone', title: '手机号码', minWidth: 120,align:'left',totalRowText: '合计'},
- {field: 'email', title: '邮箱', minWidth: 50,align:'left'},
+ //{field: 'phone', title: '手机号码', minWidth: 120,align:'left',totalRowText: '合计'},
+ //{field: 'email', title: '邮箱', minWidth: 50,align:'left'},
+ {field: 'inviteId', title: '邀请码', minWidth: 120,align:'left'},
{field: 'orderType', title: '订单类型',
templet: function (d) {
if (d.orderType === 1) {
@@ -129,7 +130,7 @@
// 获取查询参数
function getQueryParams() {
return {
- phone: $searchForm.find('input[name="phone"]').val().trim()
+ inviteId: $searchForm.find('input[name="inviteId"]').val().trim()
};
}
--
Gitblit v1.9.1