20200630 代码提交

xiaoyong931011

2020-06-30 2d57b956efa9227c602ab6598bfa8958fcea3e34

20200630   代码提交

 src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java

@@ -152,7 +152,7 @@
    }
    
    /**
     * 用户详细信息---列表
     * 平台详细信息---列表
     */
    @GetMapping("memberDataInfo")
    public FebsResponse memberDataInfo(MemberEntity memberEntity, QueryRequest request) {
@@ -160,5 +160,16 @@
        return new FebsResponse().success().data(data);
    }
    
    /**
     * 用户详细信息---列表
     * @return
     */
    @GetMapping("memberDataInfoList")
    @ControllerEndpoint(operation = "用户详细信息---充币记录", exceptionMessage = "取消失败")
    public FebsResponse memberDataInfoList(MemberCoinChargeEntity memberCoinChargeEntity, QueryRequest request) {
        Map<String, Object> data = getDataTable(memberService.findMemberApplyCoinListInPage(memberCoinChargeEntity, request));
        return new FebsResponse().success().data(data);
    }
    
    
}

 src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java

@@ -3,13 +3,11 @@
import com.xcong.excoin.common.controller.BaseController;
import com.xcong.excoin.common.entity.FebsConstant;
import com.xcong.excoin.common.utils.FebsUtil;
import com.xcong.excoin.modules.member.entity.MemberCoinChargeEntity;
import com.xcong.excoin.modules.member.entity.MemberEntity;
import com.xcong.excoin.modules.member.service.IMemberService;
import com.xcong.excoin.modules.member.vo.MemberAuthenticationVo;

import lombok.RequiredArgsConstructor;

import java.util.List;

import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller;
@@ -30,6 +28,16 @@
    private final IMemberService memberService;
    
    /**
     * 个人信息
     * @return
     */
    @GetMapping("memberDataInfoList")
    @RequiresPermissions("memberDataInfoList:view")
    public String memberDataInfoList() {
        return FebsUtil.view("modules/member/memberDataInfoList");
    }
	
    /**
     * 基础数据
     * @return
     */
@@ -38,6 +46,16 @@
    public String memberDataInfo() {
        return FebsUtil.view("modules/member/memberDataInfo");
    }
    /**
     * 基础数据---查询
     */
    @GetMapping("memberDataInfoLists/{id}")
    @RequiresPermissions("memberDataInfoLists:view")
    public String memberDataInfoList(@PathVariable long id, Model model) {
        MemberEntity memberEntity = memberService.selectMemberByid(id);
        model.addAttribute("member", memberEntity);
        return FebsUtil.view("modules/member/memberDataInfoList");
    }
    
    @GetMapping("member")
    @RequiresPermissions("member:view")

 src/main/java/com/xcong/excoin/modules/member/service/IMemberService.java

@@ -9,7 +9,6 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.xcong.excoin.common.entity.FebsResponse;
import com.xcong.excoin.common.entity.QueryRequest;
import com.xcong.excoin.modules.member.dto.MemberDataInfoDto;
import com.xcong.excoin.modules.member.dto.MemberDetailConfirmDto;
import com.xcong.excoin.modules.member.entity.MemberCoinChargeEntity;
import com.xcong.excoin.modules.member.entity.MemberCoinWithdrawEntity;
@@ -57,4 +56,8 @@

    IPage<MemberDataInfoVo> findMemberDataInfoDtoListInPage(MemberEntity memberEntity, QueryRequest request);

    MemberEntity selectMemberByid(long id);

    FebsResponse memberDataInfoList(@NotNull(message = "{required}") long id);

}

 src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java

@@ -501,4 +501,19 @@
        return selectMemberListInPage;
    }

    @Override
    public MemberEntity selectMemberByid(long id) {
        MemberEntity selectById = memberMapper.selectById(id);
        return selectById;
    }

    @Override
    public FebsResponse memberDataInfoList(@NotNull(message = "{required}") long id) {
        Map<String, Object> columnMap = new HashMap<>();
        columnMap.put("member_id", id);
        columnMap.put("STATUS", 2);
        List<MemberCoinWithdrawEntity> selectByMap = memberCoinWithdrawMapper.selectByMap(columnMap);
        return new FebsResponse().data(selectByMap);
    }

}

 src/main/resources/templates/febs/views/modules/member/applyCoin.html

@@ -35,22 +35,6 @@
        </div>

    </div>

</div>

<!-- 表格字段状态格式化 start -->

<script type="text/html" id="status">

    {{#

    var status = {

    1: {title: '已到账' , color: 'green'},

    0: {title: '已到账' },

    2: {title: '已到账' },

    3: {title: '已到账' },

    4: {title: '已到账' }

    }[d.status];

    }}

    <span class="layui-badge febs-tag-{{status.color}}">{{ status.title }}</span>

</script>



<!-- 表格字段状态格式化 start -->



<!-- 表格操作栏 end -->

<script data-th-inline="none" type="text/javascript">

    // 引入组件并初始化

@@ -106,17 +90,21 @@
                cols: [[

                    {field: 'phone', title: '手机号码', minWidth: 120,align:'left',totalRowText: '合计'},

                    {field: 'email', title: '邮箱', minWidth: 200,align:'left'},

                    {field: 'inviteId', title: '邀请码UID',

                        templet: function (d) {

                                return '<a lay-event="see" shiro:hasPermission="user:delete">'+d.inviteId+'</a>'

                            }, minWidth: 80,align:'center'},

                    {field: 'inviteId', title: '邀请码UID', minWidth: 80,align:'center'},

                    {field: 'symbol', title: '币种', minWidth: 60,align:'center'},

                    {field: 'tag', title: 'USDT类型', minWidth: 60,align:'center'},

                    {field: 'amount', title: '充币数量', minWidth: 100,align:'center',totalRow: true},

                    {field: 'lastAmount', title: '本次余额', minWidth: 100,align:'center'},

                    {field: 'address', title: '平台钱包地址', minWidth: 280,align:'center'},

                    {field: 'createTime', title: '创建时间', minWidth: 200,align:'center'},

                    {title: '状态', templet: '#status', minWidth: 100,align:'center'}

                    {field: 'status', title: '状态',

                        templet: function (d) {

                            if (d.status === 2) {

                                return '<span style="color:green;">已到账</span>'

                            } else {

                                return ''

                            }

                        }, minWidth: 200,align:'center'},

                ]]

            });

        }


 src/main/resources/templates/febs/views/modules/member/chargeUsdt.html

@@ -48,31 +48,6 @@
    </div>

</div>

<!-- 表格字段状态格式化 start -->

<script type="text/html" id="order-Status">

    {{#

    var orderStatus = {

    1: {title: '新建' , color: 'gray'},

    2: {title: '已付款' , color: 'red'},

    3: {title: '已审核' , color: 'green'},

    4: {title: '撤单' , color: 'gray'},

    5: {title: '系统取消' , color: 'blue'}

    }[d.orderStatus];

    }}

    <span class="layui-badge febs-tag-{{orderStatus.color}}">{{ orderStatus.title }}</span>

</script>

<script type="text/html" id="payment-Type">

    {{#

    var paymentType = {

    null: {title: '无' },

    1: {title: '支付宝' },

    2: {title: '微信'},

    3: {title: '银行卡' }

    }[d.paymentType];

    }}

    <span >{{ paymentType.title }}</span>

</script>



<!-- 表格字段状态格式化 start -->



<!-- 表格操作栏 start -->

<script type="text/html" id="user-option">

@@ -171,7 +146,36 @@
                    {field: 'amountCny', title: '人民币金额', minWidth: 120,align:'center',totalRow: true},

                    {field: 'amountUsdt', title: 'USDT金额', minWidth: 120,align:'center',totalRow: true},

                    {field: 'unitPrice', title: '单价', minWidth: 80,align:'center'},

                    {title: '付款状态', templet: '#order-Status', minWidth: 100,align:'center'},

                    {field: 'orderStatus', title: '付款状态',

                        templet: function (d) {

                            if (d.orderStatus === 1) {

                                return '<span style="color:gray;">新建</span>'

                            } else if(d.orderStatus === 2){

                                return '<span style="color:red;">已付款</span>'

                            } else if(d.orderStatus === 3){

                                return '<span style="color:green;">已审核</span>'

                            } else if(d.orderStatus === 4){

                                return '<span style="color:gray;">撤单</span>'

                            } else if(d.orderStatus === 5){

                                return '<span style="color:blue;">系统取消</span>'

                            }else{

                                return ''

                            }

                        }, minWidth: 120,align:'center'},

                    {field: 'paymentName', title: '收款人', minWidth: 150,align:'center'},

                    {field: 'paymentAccount', title: '收款账号', minWidth: 150,align:'center'},

                    {field: 'paymentType', title: '收款方式',

                        templet: function (d) {

                            if (d.status === 1) {

                                return '<span>支付宝</span>'

                            } else if(d.status === 2){

                                return '<span>微信</span>'

                            } else if(d.status === 3){

                                return '<span>银行卡</span>'

                            }else{

                                return '<span style="color:red;">无</span>'

                            }

                        }, minWidth: 150,align:'center'},

                    {title: '操作', 

                        templet: function (d) {

                            if (d.orderStatus === 2) {

@@ -182,9 +186,6 @@
                                return ''

                            }

                        },minWidth: 200,align:'center'},

                    {field: 'paymentName', title: '收款人', minWidth: 150,align:'center'},

                    {field: 'paymentAccount', title: '收款账号', minWidth: 150,align:'center'},

                    {title: '收款方式', templet: '#payment-Type', minWidth: 100,align:'center'},

                    {field: 'orderNo', title: '订单编号', minWidth: 150,align:'center'},

                    {field: 'createTime', title: '充值时间', minWidth: 180,align:'center'}

                ]]


 src/main/resources/templates/febs/views/modules/member/extractUsdt.html

@@ -47,33 +47,6 @@
        </div>

    </div>

</div>

<!-- 表格字段状态格式化 start -->

<script type="text/html" id="order-Status">

    {{#

    var orderStatus = {

    1: {title: '待付款' , color: 'gray'},

    2: {title: '已付款' , color: 'red'},

    3: {title: '已审核' , color: 'green'},

    4: {title: '撤单' , color: 'gray'},

    5: {title: '系统取消' , color: 'blue'}

    }[d.orderStatus];

    }}

    <span class="layui-badge febs-tag-{{orderStatus.color}}">{{ orderStatus.title }}</span>

</script>

<script type="text/html" id="payment-Type">

    {{#

    var paymentType = {

    null: {title: '无' },

    1: {title: '支付宝' },

    2: {title: '微信'},

    3: {title: '银行卡' }

    }[d.paymentType];

    }}

    <span >{{ paymentType.title }}</span>

</script>



<!-- 表格字段状态格式化 start -->



<!-- 表格操作栏 start -->

<script type="text/html" id="user-option">

    <span shiro:lacksPermission="user:view,user:update,user:delete">

@@ -173,8 +146,34 @@
                    {field: 'amountUsdt', title: 'USDT金额', minWidth: 120,align:'center',totalRow: true},

                    {field: 'unitPrice', title: '单价', minWidth: 80,align:'center'},

                    {field: 'createTime', title: '提现时间', minWidth: 180,align:'center'},

                    {title: '提现状态', templet: '#order-Status', minWidth: 100,align:'center'},

                    {title: '收款方式', templet: '#payment-Type', minWidth: 100,align:'center'},

                    {field: 'orderStatus', title: '提现状态',

                        templet: function (d) {

                            if (d.orderStatus === 1) {

                                return '<span style="color:gray;">待付款</span>'

                            } else if(d.orderStatus === 2){

                                return '<span style="color:red;">已付款</span>'

                            } else if(d.orderStatus === 3){

                                return '<span style="color:green;">已审核</span>'

                            } else if(d.orderStatus === 4){

                                return '<span style="color:gray;">撤单</span>'

                            } else if(d.orderStatus === 5){

                                return '<span style="color:blue;">系统取消</span>'

                            }else{

                                return ''

                            }

                        }, minWidth: 180,align:'center'},

                    {field: 'paymentType', title: '收款方式',

                            templet: function (d) {

                                if (d.paymentType === 1) {

                                    return '<span>支付宝</span>'

                                } else if(d.paymentType === 2){

                                    return '<span>微信</span>'

                                } else if(d.paymentType === 3){

                                    return '<span>银行卡</span>'

                                }else{

                                    return '<span style="color:red;">无</span>'

                                }

                            }, minWidth: 180,align:'center'},

                    {field: 'paymentQrcode', title: '支付码', minWidth: 120,align:'center'},

                    {field: 'orderNo', title: '订单编号', minWidth: 150,align:'center'},

                    {field: 'name', title: '收款人', minWidth: 150,align:'center'},


 src/main/resources/templates/febs/views/modules/member/member.html

@@ -30,38 +30,6 @@
        </div>
    </div>
</div>
<!-- 表格字段状态格式化 start -->
<script type="text/html" id="certify-status">
    {{#
    var certifyStatus = {
    0: {title: '未通过', color: 'red'},
    1: {title: '待审核', color: 'blue'},
    2: {title: '审核通过', color: 'green'},
    3: {title: '未实名'}
    }[d.certifyStatus];
    }}
    <span class="layui-badge febs-tag-{{certifyStatus.color}}">{{ certifyStatus.title }}</span>
</script>
<script type="text/html" id="account-type">
    {{#
    var accountType = {
    2: {title: '正常账号' , color: 'green'},
    1: {title: '测试账号' , color: 'red'}
    }[d.accountType];
    }}
    <span class="layui-badge febs-tag-{{accountType.color}}">{{ accountType.title }}</span>
</script>
<script type="text/html" id="account-status">
    {{#
    var accountStatus = {
    1: {title: '正常', color : 'blue'},
    0: {title: '禁用', color : 'red'}
    }[d.accountStatus];
    }}
    <span class="layui-badge febs-bg-{{accountStatus.color}}">{{ accountStatus.title }}</span>
</script>
<!-- 表格字段状态格式化 start -->

<!-- 表格操作栏 start -->
<script type="text/html" id="user-option">
    <span shiro:lacksPermission="user:view,user:update,user:delete">
@@ -139,9 +107,40 @@
                    {field: 'email', title: '邮箱', minWidth: 200,align:'left'},
                    {field: 'inviteId', title: '邀请码UID', minWidth: 80,align:'center'},
                    {field: 'refererId', title: '上级邀请码UID', minWidth: 80,align:'center'},
                    {title: '账号类型', templet: '#account-type', minWidth: 80,align:'center'},
                    {title: '账号状态', templet: '#account-status', minWidth: 50,align:'center'},
                    {title: '审核状态', templet: '#certify-status', 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: 'refererId', 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: '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: 180,align:'center'},
                    {title: '操作', 
                        templet: function (d) {

 src/main/resources/templates/febs/views/modules/member/memberDataInfo.html

@@ -3,9 +3,7 @@
        <div class="layui-col-md12">

            <div class="layui-card">

                <div class="layui-card-body febs-table-full">

                    <form class="layui-form layui-table-form" lay-filter="user-table-form">

                        </form>

                    <table lay-filter="userTable" lay-data="{id: 'userTable'}"></table>

                     <table id=usersTable></table>

                </div>

            </div>

        </div>

@@ -20,37 +18,60 @@
<!-- 表格操作栏 end -->

<script data-th-inline="none" type="text/javascript">

    // 引入组件并初始化

    layui.use(['dropdown', 'jquery', 'laydate', 'form', 'table', 'febs'], function () {

layui.use([ 'jquery',  'form', 'table', 'febs'], function () {

        var $ = layui.jquery,

            laydate = layui.laydate,

            febs = layui.febs,

            form = layui.form,

            table = layui.table,

            dropdown = layui.dropdown,

            $view = $('#febs-user'),

            $reset = $view.find('#reset'),

            $add = $view.find('#add'),

            $searchForm = $view.find('form'),

            sortObject = {field: 'title', type: null},

            tableIns

            ;

        tableInss,

        tableIns;



        form.render();



        // 表格初始化

        initTable();



         // 刷新按钮

        $reset.on('click', function () {

            $searchForm[0].reset();

            sortObject.type = 'null';

            tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});

        });

     	
        function initTable() {



        tableInss = febs.table.init({

            elem: $('#usersTable'),

            url: ctx + 'member/memberDataInfo',

            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: 'agentNum', 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: 'chargeUsdt', title: 'usdt充值', minWidth: 200,align:'center'},

                {field: 'appealUsdt', title: 'usdt提现', 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'}

            ]]

        });

            tableIns = febs.table.init({

                elem: $view.find('table'),

                id: 'userTable',

            elem: $('#userTable'),

                url: ctx + 'member/memberDataInfo',

                cols: [[

                    {field: 'memberCount', title: '注册用户数', minWidth: 120,align:'center'},


 src/main/resources/templates/febs/views/modules/member/memberDataInfoList.html

New file
@@ -0,0 +1,75 @@
<div class="layui-fluid layui-anim febs-anim" id="febs-user" lay-title="个人详情">

    <div class="layui-row febs-container">

        <div class="layui-col-md12">

            <div class="layui-card">

                <div class="layui-card-body febs-table-full">

                    <table id="memberWithdrawCoin"></table>

                </div>

                <div class="layui-card-body febs-table-full">

                    <table id="memberApplyCoin"></table>

                </div>

            </div>

        </div>

    </div>

</div>

<!-- 表格操作栏 end -->

<script data-th-inline="none" type="text/javascript">

    // 引入组件并初始化

    layui.use([ 'jquery', 'form', 'table', 'febs'], function () {

        var $ = layui.$,

            febs = layui.febs,

            form = layui.form,

            table = layui.table,

            $view = $('#febs-user'),

            memberWithdrawCoin,

            memberApplyCoin;

        
        form.render();

        
        initTable();

        
        function initTable() {

            memberWithdrawCoin = febs.table.init({

                elem: $('#memberWithdrawCoin'),

                url: ctx + 'member/memberWithdrawCoin?account='+2,

                cols: [[

                    {field: 'inviteId', title: '邀请码UID', minWidth: 80,align:'center'},

                    {field: 'symbol', title: '币种', minWidth: 100,align:'center'},

                    {field: 'amount', title: '提币数量', minWidth: 120,align:'center' ,totalRow: true},

                    {field: 'address', title: '提币地址', minWidth: 300,align:'center'},

                    {field: 'createTime', title: '提币时间', minWidth: 180,align:'center'},

                    {field: 'isInside', title: '内部转账',

                        templet: function (d) {

                            if (d.isInside === 'Y') {

                                return '<span style="color:red;">是</span>'

                            } else {

                                return '<span style="color:green;">否</span>'

                            }

                        },minWidth: 100,align:'center'},

                    {field: 'status', title: '状态',

                        templet: function (d) {

                            if (d.status === 1) {

                                return '<span style="color:blue;"> 等待审核 </span>'

                            } else if (d.status === 2) {

                                return '<span style="color:green;">同意 </span>'

                            } else {

                                return '<span style="color:red;">拒绝</span>'

                            }

                        },minWidth: 100,align:'center'},

                ]]

            });

            memberApplyCoin = febs.table.init({

                elem: $('#memberApplyCoin'),

                url: ctx + 'member/memberApplyCoin?account='+2,

                cols: [[

                    {field: 'inviteId', title: '邀请码UID', minWidth: 80,align:'center'},

                    {field: 'symbol', title: '币种', minWidth: 60,align:'center'},

                    {field: 'tag', title: 'USDT类型', minWidth: 60,align:'center'},

                    {field: 'amount', title: '充币数量', minWidth: 100,align:'center',totalRow: true},

                    {field: 'createTime', title: '创建时间', minWidth: 200,align:'center'},

                    {title: '状态', templet: '#status', minWidth: 100,align:'center'}

                ]]

            });

        }

    })

</script>

 src/main/resources/templates/febs/views/modules/member/withdrawCoin.html

@@ -63,14 +63,12 @@
<!-- 表格操作栏 end -->

<script data-th-inline="none" type="text/javascript">

    // 引入组件并初始化

    layui.use(['dropdown', 'jquery', 'laydate', 'form', 'table', 'febs', 'treeSelect'], function () {

    layui.use(['jquery', 'laydate', 'form', 'table', 'febs'], function () {

        var $ = layui.jquery,

            laydate = layui.laydate,

            febs = layui.febs,

            form = layui.form,

            table = layui.table,

            treeSelect = layui.treeSelect,

            dropdown = layui.dropdown,

            $view = $('#febs-user'),

            $query = $view.find('#query'),

            $reset = $view.find('#reset'),

@@ -83,17 +81,9 @@
        // 表格初始化

        initTable();



        // 下拉框选择器

        treeSelect.render({

            elem: $view.find('#dept'),

            type: 'get',

            data: ctx + 'dept/select/tree',

            placeholder: '请选择',

            search: false

        });



        // 初始化表格操作栏各个按钮功能

        table.on('tool(userTable)', function (obj) {

            $query.click();

            var data = obj.data,

                layEvent = obj.event;

            if (layEvent === 'confirm') {

@@ -106,7 +96,12 @@
                    cancelUsers(data.id);

                });

            }

            if (layEvent === 'see') {

                console.log(obj)

                febs.view.tab.change(ctx + "modules/member/memberDataInfoLists/" + data.id);

            }

        });

        
        

        function confirmUsers(id) {

            febs.get(ctx + 'member/memberWithdrawCoinConfirm/' + id, null, function () {

@@ -144,10 +139,7 @@
                cols: [[

                    {field: 'phone', title: '手机号码', minWidth: 120,align:'left',totalRowText: '合计'},

                    {field: 'email', title: '邮箱', minWidth: 200,align:'left'},

                    {field: 'inviteId', title: '邀请码UID',

                        templet: function (d) {

                            return '<a lay-event="see">'+d.inviteId+'</a>'

                        }, minWidth: 80,align:'center'},

                    {field: 'inviteId', title: '邀请码UID', minWidth: 80,align:'center'},

                    {field: 'symbol', title: '币种', minWidth: 100,align:'center'},

                    {field: 'amount', title: '提币数量', minWidth: 120,align:'center' ,totalRow: true},

                    {field: 'address', title: '提币地址', minWidth: 300,align:'center'},


 src/main/resources/templates/febs/views/modules/trademanage/accountInfo.html

@@ -30,15 +30,6 @@
        </div>

    </div>

</div>

<script type="text/html" id="isSuAccount">

    {{#

    var isSuAccount = {

    "1": {title: '是' , color: 'green'},

    "0": {title: '否' , color: 'red' }

    }[d.isSuAccount];

    }}

    <span class="layui-badge febs-tag-{{isSuAccount.color}}">{{ isSuAccount.title }}</span>

</script>

<!-- 表格操作栏 end -->

<script data-th-inline="none" type="text/javascript">

    // 引入组件并初始化

@@ -91,7 +82,16 @@
                    {field: 'walletAvailableBalance', title: '合约可用', minWidth: 80,align:'center',totalRow: true},

                    {field: 'walletFrozenBalance', title: '合约冻结', minWidth: 80,align:'center',totalRow: true},

                    {field: 'walletTotalBalance', title: '合约总金额', minWidth: 80,align:'center',totalRow: true},

                    {title: '是否是代理', templet: '#isSuAccount', minWidth: 100,align:'center'},

                    {field: 'isSuAccount', title: '是否是代理',

                        templet: function (d) {

                            if (d.isSuAccount === 1) {

                                return '<span style="color:green;">是</span>'

                            } else if (d.isSuAccount === 0) {

                                return '<span style="color:red;">否</span>'

                            } else {

                                return ''

                            }

                        }, minWidth: 80,align:'center',totalRow: true},

                    {field: 'agentAvailableBalance', title: '代理账户', minWidth: 80,align:'center',totalRow: true}

                ]]

            });


 src/main/resources/templates/febs/views/modules/trademanage/agentReturnInfo.html

@@ -30,26 +30,6 @@
        </div>

    </div>

</div>

<script type="text/html" id="isType">

    {{#

    var type = {

    "1": {title: '币币资产' , color: 'red'},

    "2": {title: '合约资产' , color: 'green'},

    "3": {title: '代理资产' , color: 'blue' }

    }[d.type];

    }}

    <span class="layui-badge febs-tag-{{type.color}}">{{ type.title }}</span>

</script>

<script type="text/html" id="status">

    {{#

    var status = {

    "2": {title: '失败' , color: 'red'},

    "1": {title: '成功' , color: 'green'},

    "0": {title: '待审核' , color: 'blue' }

    }[d.status];

    }}

    <span class="layui-badge febs-tag-{{status.color}}">{{ status.title }}</span>

</script>

<!-- 表格操作栏 end -->

<script data-th-inline="none" type="text/javascript">

    // 引入组件并初始化

@@ -100,8 +80,30 @@
                    {field: 'amount', title: '金额', minWidth: 80,align:'center',totalRow: true},

                    {field: 'content', title: '记录内容', minWidth: 80,align:'center'},

                    {field: 'createTime', title: '时间', minWidth: 80,align:'center'},

                    {title: '状态', templet: '#status', minWidth: 100,align:'center'},

                    {title: '类型', templet: '#isType', minWidth: 100,align:'center'},

                    {field: 'status', title: '状态',

                        templet: function (d) {

                            if (d.status === 0) {

                                return '<span style="color:blue;">待审核</span>'

                            } else if (d.status === 1) {

                                return '<span style="color:green;">成功</span>'

                            }else if (d.status === 2) {

                                return '<span style="color:red;">失败</span>'

                            }else{

                                return ''

                            }

                        }, minWidth: 80,align:'center'},

                    {field: 'type', title: '类型',

                            templet: function (d) {

                                if (d.type === 1) {

                                    return '<span>币币资产</span>'

                                } else if (d.type === 2) {

                                    return '<span>合约资产</span>'

                                }else if (d.type === 3) {

                                    return '<span>代理资产</span>'

                                }else{

                                    return ''

                                }

                            }, minWidth: 80,align:'center'}

                ]]

            });

        }


 src/main/resources/templates/febs/views/modules/trademanage/contractHoldOrder.html

@@ -30,24 +30,6 @@
        </div>

    </div>

</div>

<script type="text/html" id="tradeType">

    {{#

    var tradeType = {

    1: {title: '市价' , color: 'green'},

    2: {title: '限价' , color: 'blue' }

    }[d.tradeType];

    }}

    <span class="layui-badge febs-tag-{{tradeType.color}}">{{ tradeType.title }}</span>

</script>

<script type="text/html" id="openingType">

    {{#

    var openingType = {

    1: {title: '开多' , color: 'green'},

    2: {title: '开空' , color: 'red' }

    }[d.openingType];

    }}

    <span class="layui-badge febs-tag-{{openingType.color}}">{{ openingType.title }}</span>

</script>

<!-- 表格操作栏 end -->

<script data-th-inline="none" type="text/javascript">

    // 引入组件并初始化

@@ -95,8 +77,22 @@
                    {field: 'email', title: '邮箱', minWidth: 200,align:'left'},

                    {field: 'inviteId', title: '邀请码UID', minWidth: 120,align:'center'},

                    {field: 'orderNo', title: '订单编号', minWidth: 200,align:'center'},

                    {title: '开仓类型', templet: '#openingType', minWidth: 80,align:'center'},

                    {title: '交易类型', templet: '#tradeType', minWidth: 80,align:'center'},

                    {field: 'openingType', title: '开仓类型', 
                        templet: function (d) {

                            if (d.openingType === 1) {

                                return '<span style="color:green;">开多</span>'

                            }else {

                                return '<span style="color:red;">开空</span>'

                            }

                        }, minWidth: 100,align:'center'},

                    {field: 'tradeType', title: '交易类型', 
                            templet: function (d) {

                                if (d.tradeType === 1) {

                                    return '<span style="color:green;">市价</span>'

                                }else {

                                    return '<span style="color:red;">限价</span>'

                                }

                            }, minWidth: 100,align:'center'},

                    {field: 'symbol', title: '币种', minWidth: 100,align:'center'},

                    {field: 'symbolCnt', title: '手数', minWidth: 80,align:'center'},

                    {field: 'rewardRatio', title: '实时盈亏', 


 src/main/resources/templates/febs/views/modules/trademanage/historyOrder.html

@@ -30,69 +30,6 @@
        </div>

    </div>

</div>

<script type="text/html" id="tradeType">

    {{#

    var tradeType = {

    1: {title: '市价' , color: 'green'},

    2: {title: '限价' , color: 'blue' }

    }[d.tradeType];

    }}

    <span class="layui-badge febs-tag-{{tradeType.color}}">{{ tradeType.title }}</span>

</script>

<script type="text/html" id="closingType">

    {{#

    var closingType = {

    0: {title: '开仓' , color: 'blue'},

    2: {title: '平多' , color: 'green'},

    3: {title: '平空' , color: 'red'},

    4: {title: '爆仓平多' , color: 'red'},

    5: {title: '爆仓平空' , color: 'red'},

    6: {title: '止盈平多' , color: 'green'},

    7: {title: '止盈平空' , color: 'green'},

    8: {title: '止损平多' , color: 'red'},

    9: {title: '止损平空' , color: 'red'}

    }[d.closingType];

    }}

    <span class="layui-badge febs-tag-{{closingType.color}}">{{ closingType.title }}</span>

</script>

<script type="text/html" id="orderStatus">

    {{#

    var orderStatus = {

    1: {title: '成交' , color: 'green'},

    2: {title: '撤单' , color: 'blue' }

    }[d.orderStatus];

    }}

    <span class="layui-badge febs-tag-{{orderStatus.color}}">{{ orderStatus.title }}</span>

</script>

<script type="text/html" id="orderType">

    {{#

    var orderType = {

    1: {title: '开多' , color: 'green'},

    2: {title: '开空' , color: 'red'},

    3: {title: '平多' , color: 'green'},

    4: {title: '平空' , color: 'red' }

    }[d.orderType];

    }}

    <span class="layui-badge febs-tag-{{orderType.color}}">{{ orderType.title }}</span>

</script>

<script type="text/html" id="openingType">

    {{#

    var openingType = {

    1: {title: '开多' , color: 'green'},

    2: {title: '开空' , color: 'red' }

    }[d.openingType];

    }}

    <span class="layui-badge febs-tag-{{openingType.color}}">{{ openingType.title }}</span>

</script>

<script type="text/html" id="isCanClosing">

    {{#

    var openingType = {

    1: {title: '是' , color: 'green'},

    0: {title: '否' , color: 'red' }

    }[d.isCanClosing];

    }}

    <span class="layui-badge febs-tag-{{isCanClosing.color}}">{{ isCanClosing.title }}</span>

</script>

<!-- 表格操作栏 end -->

<script data-th-inline="none" type="text/javascript">

    // 引入组件并初始化

@@ -140,10 +77,62 @@
                    {field: 'email', title: '邮箱', minWidth: 200,align:'left'},

                    {field: 'inviteId', title: '邀请码UID', minWidth: 120,align:'center'},

                    {field: 'orderNo', title: '订单编号', minWidth: 200,align:'center'},

                    {title: '交易类型', templet: '#tradeType', minWidth: 120,align:'center'},

                    {title: '订单类型', templet: '#orderType', minWidth: 120,align:'center'},

                    {title: '订单状态', templet: '#orderStatus', minWidth: 120,align:'center'},

                    {title: '平仓类型', templet: '#closingType', minWidth: 120,align:'center'},

                    {field: 'tradeType', title: '交易类型', 
                        templet: function (d) {

                            if (d.tradeType === 1) {

                                return '<span style="color:green;">市价</span>'

                            }else {

                                return '<span style="color:red;">限价</span>'

                            }

                        }, minWidth: 120,align:'center'},

                    {field: 'orderType', title: '订单类型', 
                        templet: function (d) {

                            if (d.orderType === 1) {

                                return '<span style="color:green;">开多</span>'

                            }else if (d.orderType === 2) {

                                return '<span style="color:red;">开空</span>'

                            }else if (d.orderType === 3) {

                                return '<span style="color:green;">平多</span>'

                            }else if (d.orderType === 4) {

                                return '<span style="color:red;">平空</span>'

                            }else{

                                return ''

                            }

                        }, minWidth: 120,align:'center'},

                    {field: 'orderStatus', title: '订单状态', 
                        templet: function (d) {

                            if (d.orderStatus === 1) {

                                return '<span style="color:green;">成交</span>'

                            }else if (d.orderStatus === 2) {

                                return '<span style="color:red;">撤单</span>'

                            }else{

                                return ''

                            }

                        }, minWidth: 120,align:'center'},

                    {field: 'closingType', title: '平仓类型', 
                        templet: function (d) {

                            if (d.closingType === 0) {

                                return '<span style="color:blue;">开仓</span>'

                            }else if (d.closingType === 2) {

                                return '<span style="color:green;">平多</span>'

                            }else if (d.closingType === 3) {

                                return '<span style="color:red;">平空</span>'

                            }else if (d.closingType === 4) {

                                return '<span style="color:red;">爆仓平多</span>'

                            }else if (d.closingType === 5) {

                                return '<span style="color:red;">爆仓平空</span>'

                            }else if (d.closingType === 6) {

                                return '<span style="color:green;">止盈平多</span>'

                            }else if (d.closingType === 7) {

                                return '<span style="color:green;">止盈平空</span>'

                            }else if (d.closingType === 8) {

                                return '<span style="color:red;">止损平多</span>'

                            }else if (d.closingType === 9) {

                                return '<span style="color:red;">止损平空</span>'

                            }else{

                                return ''

                            }

                        }, minWidth: 120,align:'center'},

                    {field: 'rewardAmount', title: '盈亏金额', 

                        templet: function (d) {

                            if (d.rewardAmount > 0) {