20210121

xiaoyong931011

2021-01-21 c3d290fcd993ea844ffecb8bdd7ce2105fec3d0e

20210121

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

@@ -6,6 +6,7 @@
import com.xcong.excoin.common.entity.QueryRequest;

import com.xcong.excoin.modules.member.dto.MemberDetailConfirmDto;

import com.xcong.excoin.modules.member.entity.AgentFriendRelationEntity;

import com.xcong.excoin.modules.member.entity.MemberAccountMoneyChangeEntity;

import com.xcong.excoin.modules.member.entity.MemberCoinChargeEntity;

import com.xcong.excoin.modules.member.entity.MemberCoinWithdrawEntity;

import com.xcong.excoin.modules.member.entity.MemberEntity;

@@ -50,6 +51,16 @@
    }

    

    /**

     * 会员列表---拨币记录

     * @return

     */

    @GetMapping("memberBoBiList")

    public FebsResponse memberBoBiList(MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity, QueryRequest request) {

        Map<String, Object> data = getDataTable(memberService.memberBoBiList(memberAccountMoneyChangeEntity, request));

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

    }

    
    /**

     * 代理关系---列表

     * @return

     */


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

@@ -37,6 +37,16 @@
    }

    

    /**

     * 会员列表---拨币记录

     * @return

     */

    @GetMapping("memberBoBiList")

    @RequiresPermissions("memberBoBiList:view")

    public String memberBoBiList() {

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

    }

	
    /**

     * 代理关系

     * @return

     */


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

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

import com.baomidou.mybatisplus.core.metadata.IPage;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

import com.xcong.excoin.modules.member.entity.MemberAccountMoneyChangeEntity;

import com.xcong.excoin.modules.member.entity.MemberEntity;

import com.xcong.excoin.modules.member.vo.MemberDataInfoVo;

import com.xcong.excoin.modules.trademanage.vo.MemberAccountInfoVo;

@@ -386,5 +387,8 @@
    String selectWalletTotalBalanceBymemberId(@Param("memberId")Long memberId);



    String selectWalletFrozenBalanceBymemberId(@Param("memberId")Long memberId);



    IPage<MemberAccountMoneyChangeEntity> memberBoBiList(Page<MemberAccountMoneyChangeEntity> page,

            @Param("record")MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity);

    

}


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

@@ -11,6 +11,7 @@
import com.xcong.excoin.common.entity.QueryRequest;

import com.xcong.excoin.modules.member.dto.MemberDetailConfirmDto;

import com.xcong.excoin.modules.member.entity.AgentFriendRelationEntity;

import com.xcong.excoin.modules.member.entity.MemberAccountMoneyChangeEntity;

import com.xcong.excoin.modules.member.entity.MemberCoinChargeEntity;

import com.xcong.excoin.modules.member.entity.MemberCoinWithdrawEntity;

import com.xcong.excoin.modules.member.entity.MemberEntity;

@@ -130,4 +131,6 @@


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



    IPage<MemberAccountMoneyChangeEntity> memberBoBiList(MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity, QueryRequest request);



}


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

@@ -2173,4 +2173,13 @@
        return selectMemberListInPage;
    }


    @Override
    public IPage<MemberAccountMoneyChangeEntity> memberBoBiList(
            MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity, QueryRequest request) {
        Page<MemberAccountMoneyChangeEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
        IPage<MemberAccountMoneyChangeEntity> findmemberQuickBuySaleListInPage = memberMapper.memberBoBiList(page, memberAccountMoneyChangeEntity);
        return findmemberQuickBuySaleListInPage;
    }

}

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

@@ -2,6 +2,26 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">

<mapper namespace="com.xcong.excoin.modules.member.mapper.MemberMapper">



    <select id="memberBoBiList" resultType="com.xcong.excoin.modules.member.entity.MemberAccountMoneyChangeEntity">

        SELECT

            *

        FROM

            member_account_money_change a

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

        <where>

            a.content = '充值'  and `status` = 1

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

        </where>

        order by m.create_time desc

    </select>



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

        SELECT

            IFNULL(SUM(a.frozen_balance),'0')


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

New file
@@ -0,0 +1,124 @@
<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="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="confirm" shiro:hasPermission="user:delete">确认</a>

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

    <a lay-event="cancel" shiro:hasPermission="user:delete">拒绝</a>

</script>

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

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

    // 引入组件并初始化

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

        var $ = layui.jquery,

            laydate = layui.laydate,

            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: 'createTime', type: null},

            tableIns;



        form.render();



        // 表格初始化

        initTable();



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

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

            $query.click();

        });

        
        // 查询按钮

        $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/memberBoBiList',

                totalRow: true,

                cols: [[

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

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

                    {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: 'inviteId', title: '邀请码UID', minWidth: 80,align:'center'},

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

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

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

            };

        }

        
    })

</script>

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

@@ -110,13 +110,13 @@
                                return '<span style="color:red;">' + d.rewardRatio + '</span>'

                            }

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

                    {field: 'symbolSku', title: '币种规格', minWidth: 120,align:'center'},

                    {field: 'leverRatio', title: '杠杆倍率', minWidth: 120,align:'center'},

                    {field: 'openingPrice', title: '开仓价', minWidth: 100,align:'center'},

                    {field: 'openingFeeAmount', title: '开仓手续费', minWidth: 120,align:'center',totalRow: true},

                    {field: 'holdAmount', title: '持仓手续费', minWidth: 120,align:'center',totalRow: true},

                    {field: 'bondAmount', title: '保证金', minWidth: 120,align:'center'},

                    {field: 'prePaymentAmount', title: '预付款金额', minWidth: 120,align:'center'},

                    {field: 'leverRatio', title: '杠杆倍率', minWidth: 120,align:'center'},

                    {field: 'symbolSku', title: '币种规格', minWidth: 120,align:'center'},

                    {field: 'stopLossPrice', title: '止损价', minWidth: 120,align:'center'},

                    {field: 'stopProfitPrice', title: '止盈价', minWidth: 120,align:'center'},

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