From 5cf304705729e9735cca04d57d921ffccf297421 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Fri, 24 Jul 2020 15:54:59 +0800 Subject: [PATCH] 20200724 代码提交 --- src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 18 ++++++++++++++++++ src/main/resources/mapper/modules/MemberCoinChargeMapper.xml | 3 +++ src/main/resources/templates/febs/views/modules/member/applyCoin.html | 24 +++++++++++++++++++++--- 3 files changed, 42 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java index 2a876e1..163b15e 100644 --- a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java +++ b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java @@ -1,5 +1,6 @@ package com.xcong.excoin.modules.member.service.impl; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; @@ -396,6 +397,23 @@ QueryRequest request) { Page<MemberCoinChargeEntity> page = new Page<>(request.getPageNum(), request.getPageSize()); IPage<MemberCoinChargeVo> findmemberQuickBuySaleListInPage = memberCoinChargeMapper.findMemberApplyCoinListInPage(page, memberCoinChargeEntity); + List<MemberCoinChargeVo> records = findmemberQuickBuySaleListInPage.getRecords(); + if(CollUtil.isNotEmpty(records)) { + for(MemberCoinChargeVo memberCoinChargeVo : records) { + Long memberId = memberCoinChargeVo.getMemberId(); + Map<String, Object> columnMap = new HashMap<>(); + columnMap.put("member_id", memberId); + List<MemberAuthenticationEntity> selectByMap = memberAuthenticationMapper.selectByMap(columnMap ); + if(selectByMap != null && selectByMap.size() > 0) { + MemberAuthenticationEntity memberAuthenticationEntity = selectByMap.get(0); + String firstName = memberAuthenticationEntity.getFirstName(); + String secondName = memberAuthenticationEntity.getSecondName(); + String realName = firstName + secondName; + memberCoinChargeVo.setRealName(realName); + } + } + } + return findmemberQuickBuySaleListInPage; } diff --git a/src/main/resources/mapper/modules/MemberCoinChargeMapper.xml b/src/main/resources/mapper/modules/MemberCoinChargeMapper.xml index 82fd28c..90df952 100644 --- a/src/main/resources/mapper/modules/MemberCoinChargeMapper.xml +++ b/src/main/resources/mapper/modules/MemberCoinChargeMapper.xml @@ -12,6 +12,9 @@ <if test="record.address!=null and record.address!=''"> and s.address=#{record.address} </if> + <if test="record.isTest!=null and record.isTest!=''"> + and m.account_type= #{record.isTest} + </if> </if> </where> order by s.create_time desc 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 ac9c4be..2b20829 100644 --- a/src/main/resources/templates/febs/views/modules/member/applyCoin.html +++ b/src/main/resources/templates/febs/views/modules/member/applyCoin.html @@ -17,6 +17,16 @@ <input type="text" placeholder="充币地址" name="address" 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"> @@ -76,9 +86,7 @@ // 刷新按钮 $reset.on('click', function () { $searchForm[0].reset(); - treeSelect.revokeNode('dept'); - sortObject.type = 'null'; - tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject}); + tableIns.reload({where: getQueryParams(), page: {curr: 1}}); }); function initTable() { @@ -89,6 +97,7 @@ totalRow: true, cols: [[ {field: 'phone', title: '手机号码', minWidth: 120,align:'left',totalRowText: '合计'}, + {field: 'realName', title: '姓名', minWidth: 120,align:'left'}, {field: 'email', title: '邮箱', minWidth: 200,align:'left'}, {field: 'inviteId', title: '邀请码UID', minWidth: 80,align:'center'}, {field: 'symbol', title: '币种', minWidth: 60,align:'center'}, @@ -97,6 +106,14 @@ {field: 'lastAmount', title: '本次余额', minWidth: 100,align:'center'}, {field: 'address', title: '平台钱包地址', minWidth: 280,align:'center'}, {field: 'createTime', title: '创建时间', minWidth: 200,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: 'status', title: '状态', templet: function (d) { if (d.status === 1) { @@ -114,6 +131,7 @@ return { account: $searchForm.find('input[name="account"]').val().trim(), address: $searchForm.find('input[name="address"]').val().trim(), + isTest: $searchForm.find("select[name='isTest']").val() }; } -- Gitblit v1.9.1