20200723 代码提交

xiaoyong931011

2020-07-23 7dfc9a0b3164a197eb153f10a92ee4f511bc0810

20200723  代码提交

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

@@ -77,6 +77,12 @@
        return new FebsResponse().success().data(data);

    }

    

    @GetMapping("memberAloneTest")

    public FebsResponse memberAloneTest(MemberEntity member, QueryRequest request) {

        Map<String, Object> data = getDataTable(memberService.findMemberAloneTestInPage(member, request));

        return new FebsResponse().success().data(data);

    }

    
    /**

     * 实名认证---确认

     * @return


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

@@ -116,6 +116,12 @@
        return FebsUtil.view("modules/member/memberAlone");

    }

    

    @GetMapping("memberAloneTest")

    @RequiresPermissions("memberAloneTest:view")

    public String memberAloneTest() {

        return FebsUtil.view("modules/member/memberAloneTest");

    }

    
    @GetMapping("memberDetail/{id}")

    @RequiresPermissions("member:update")

    public String memberDetail(@PathVariable long id, Model model) {


 src/main/java/com/xcong/excoin/modules/member/mapper/MemberMapper.java

@@ -90,6 +90,8 @@
    String selectDLZCForBasicRealDataBymemberId(Long memberId);



    IPage<MemberEntity> findMemberAloneInPage(Page<MemberEntity> page, @Param("record") MemberEntity member);

	
    IPage<MemberEntity> findMemberAloneTestInPage(Page<MemberEntity> page, @Param("record") MemberEntity member);



    IPage<MemberDataInfoVo> selectMemberDataInfoDtoListInPageAlone(Page<MemberEntity> page, @Param("record") MemberEntity memberEntity);

    IPage<MemberDataInfoVo> selectMemberDataInfoDtoRealListInPageAlone(Page<MemberEntity> page, @Param("record") MemberEntity memberEntity);


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

@@ -87,4 +87,6 @@


    IPage<MemberCoinChargeVo> findMemberApplyCoinAloneTestInPage(MemberCoinChargeEntity memberCoinChargeEntity, QueryRequest request);



    IPage<MemberEntity> findMemberAloneTestInPage(MemberEntity member, QueryRequest request);



}


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

@@ -1099,4 +1099,20 @@
        return findmemberQuickBuySaleListInPage;
    }


    @Override
    public IPage<MemberEntity> findMemberAloneTestInPage(MemberEntity member, QueryRequest request) {
        Page<MemberEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
        IPage<MemberEntity> selectMemberListInPage = this.baseMapper.findMemberAloneTestInPage(page, member);
        List<MemberEntity> records = selectMemberListInPage.getRecords();
        if(records != null && records.size() > 0) {
            for(MemberEntity memberEntitys : records) {
                String firstName = (memberEntitys.getFirstName() == null ? "" : memberEntitys.getFirstName());
                String secondName = (memberEntitys.getSecondName() == null ? "" : memberEntitys.getSecondName());
                memberEntitys.setRealName(firstName+secondName);
            }
        }
        return selectMemberListInPage;
    }

}

 src/main/resources/mapper/modules/MemberMapper.xml

@@ -56,6 +56,29 @@
        order by m.create_time desc

    </select>

    

    <select id="findMemberAloneTestInPage" resultType="com.xcong.excoin.modules.member.entity.MemberEntity">

        SELECT

            *

        FROM

            member m

        LEFT JOIN member_authentication a ON m.id = a.member_id

        <where>

            (m.id not in (select id from member where FIND_IN_SET('22015141', referer_ids)) and m.id != 10)

            <if test="record != null" >

                <if test="record.account!=null and record.account!=''">

                    and (m.phone = #{record.account} or m.email = #{record.account} or m.invite_id=#{record.account})

                </if>

                 <if test="record.isTest!=null and record.isTest!=''">

                    and m.account_type= #{record.isTest}

                </if>

                <if test="record.certifyStatus != null and record.certifyStatus!=''">

                    and m.certify_status = #{record.certifyStatus}

                </if>

            </if>

        </where>

        order by m.create_time desc

    </select>

    
    <select id="findMemberListTestInPage" resultType="com.xcong.excoin.modules.member.entity.MemberEntity">

        SELECT

            *


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

New file
@@ -0,0 +1,160 @@
<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">

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

                        <div class="layui-row">

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

                                <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>

                                        </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">

                                <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain table-action" id="query">

                                    <i class="layui-icon">&#xe848;</i>

                                </div>

                                <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="reset">

                                    <i class="layui-icon">&#xe79b;</i>

                                </div>

                            </div>

                        </div>

                    </form>

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

                </div>

            </div>

        </div>

    </div>

</div>

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

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

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

        <span class="layui-badge-dot febs-bg-orange"></span> 无权限

    </span>

    <a lay-event="edit" shiro:hasPermission="user:update"><i

            class="layui-icon febs-edit-area febs-blue">&#xe7a5;</i></a>

</script>

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

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

    // 引入组件并初始化

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

        var $ = layui.jquery,

            febs = layui.febs,

            form = layui.form,

            table = layui.table,

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

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

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

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

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

            tableIns;



        form.render();



        // 表格初始化

        initTable();



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

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

            var data = obj.data,

                layEvent = obj.event;

            
        });

        


        // 查询按钮

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

            var params = $.extend(getQueryParams(), {field: sortObject.field, order: sortObject.type});

            tableIns.reload({where: params, page: {curr: 1}});

        });



        // 刷新按钮

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

            $searchForm[0].reset();

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

        });



        function initTable() {

            tableIns = febs.table.init({

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

                id: 'userTable',

                url: ctx + 'member/memberAloneTest',

                cols: [[

                    {field: 'phone', title: '手机号', minWidth: 100,align:'left'},

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

                    {field: 'realName', title: '姓名', minWidth: 200,align:'left'},

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

                    {field: 'refererId', title: '上级邀请码UID', 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: 'accountType', title: '账号类型',

                                templet: function (d) {

                                    if (d.accountType === 2) {

                                        return '<span style="color:red;">测试账号</span>'

                                    } else {

                                        return '<span style="color:green;">正常账号</span>'

                                    }

                                },minWidth: 100,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'}

                ]]

            });

        }



        // 获取查询参数

        function getQueryParams() {

            return {

                account: $searchForm.find('input[name="account"]').val().trim(),

                isTest: $searchForm.find("select[name='isTest']").val(),

                certifyStatus: $searchForm.find("select[name='certifyStatus']").val(),

            };

        }



    })

</script>