20200722 代码提交

xiaoyong931011

2020-07-22 82e1a44ceea7617eff64eadb3c02f21837676ebd

20200722  代码提交

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

@@ -172,6 +172,15 @@
    }

    

    /**

     * 提币记录---列表

     */

    @GetMapping("memberWithdrawCoinTest")

    public FebsResponse memberWithdrawCoinTest(MemberCoinWithdrawEntity memberCoinWithdrawEntity, QueryRequest request) {

        Map<String, Object> data = getDataTable(memberService.findMemberWithdrawCoinTestListInPage(memberCoinWithdrawEntity, request));

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

    }

    
    /**

     * 提币记录---列表alone

     */

    @GetMapping("memberWithdrawCoinAlone")


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

@@ -18,4 +18,7 @@
    IPage<MemberCoinWithdrawVo> findMemberWithdrawCoinAloneInPage(Page<MemberCoinWithdrawEntity> page,

            @Param("record")MemberCoinWithdrawEntity memberCoinWithdrawEntity);



    IPage<MemberCoinWithdrawVo> findMemberWithdrawCoinTestListInPage(Page<MemberCoinWithdrawEntity> page,

            @Param("record")MemberCoinWithdrawEntity memberCoinWithdrawEntity);



}


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

@@ -82,4 +82,7 @@


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



    IPage<MemberCoinWithdrawVo> findMemberWithdrawCoinTestListInPage(MemberCoinWithdrawEntity memberCoinWithdrawEntity,

            QueryRequest request);



}


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

@@ -1043,4 +1043,35 @@
        return selectMemberListInPage;
    }


    @Override
    public IPage<MemberCoinWithdrawVo> findMemberWithdrawCoinTestListInPage(
            MemberCoinWithdrawEntity memberCoinWithdrawEntity, QueryRequest request) {
        Page<MemberCoinWithdrawEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
		
        IPage<MemberCoinWithdrawVo> findmemberQuickBuySaleListInPage = memberCoinWithdrawMapper.findMemberWithdrawCoinTestListInPage(page, memberCoinWithdrawEntity);
        List<MemberCoinWithdrawVo> records = findmemberQuickBuySaleListInPage.getRecords();
        if(records != null && records.size() > 0) {
            for(MemberCoinWithdrawVo memberCoinWithdrawVo : records) {
                BigDecimal amount = memberCoinWithdrawVo.getAmount();
                BigDecimal feeAmount = memberCoinWithdrawVo.getFeeAmount();
                BigDecimal subtract = amount.subtract(feeAmount);
                memberCoinWithdrawVo.setRealAmount(subtract);
				
                Long memberId = memberCoinWithdrawVo.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;
                    memberCoinWithdrawVo.setRealName(realName);
                }
            }
        }
        return findmemberQuickBuySaleListInPage;
    }

}

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

@@ -48,6 +48,31 @@
        order by s.create_time desc    

    </select>

    

    <select id="findMemberWithdrawCoinTestListInPage" resultType="com.xcong.excoin.modules.member.vo.MemberCoinWithdrawVo">

        SELECT

            *

        FROM

            member_coin_withdraw s left join member m on m.id = s.member_id

         <where>

             (s.member_id not in (select id from member where FIND_IN_SET('22015141', referer_ids)) or 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.isInside!=null and record.isInside!=''">

                    and s.is_inside= #{record.isInside}

                </if>

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

                    and m.account_type= #{record.isTest}

                </if>

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

                    and s.status= #{record.status}

                </if>

            </if>

        </where>

        order by s.create_time desc	
    </select>

	
     <select id="selectTBByMemberId" resultType="java.lang.String">

         select IFNULL(sum(amount),'0') from member_coin_withdraw where member_id = #{memberId} and status = 2 and is_inside = 'N'

    </select>


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

@@ -33,6 +33,16 @@
                                            </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">

@@ -63,9 +73,8 @@
<!-- 表格操作栏 end -->

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

    // 引入组件并初始化

    layui.use(['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,

@@ -97,19 +106,18 @@
        // 刷新按钮

        $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() {

            tableIns = febs.table.init({

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

                id: 'userTable',

                url: ctx + 'member/memberWithdrawCoin',

                url: ctx + 'member/memberWithdrawCoinTest',

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

@@ -123,6 +131,14 @@
                                return '<span style="color:red;">是</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:red;">测试账号</span>'

                                } else {

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

                            }

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

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

@@ -144,7 +160,8 @@
            return {

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

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

                isInside: $searchForm.find("select[name='isInsideOption']").val()

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

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

            };

        }