20200723 代码提交

xiaoyong931011

2020-07-23 736d26948492ac036a0e2ec2e5d83c7b764d34ed

20200723  代码提交

 src/main/java/com/xcong/excoin/modules/trademanage/controller/TradeManageController.java

@@ -122,6 +122,14 @@
        Map<String, Object> data = getDataTable(tradeManageService.findHistoryOrderInfoAloneInfoInPage(contractOrderEntity, request));

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

    }

    /**

     * 历史委托明细---Test

     */

    @GetMapping("historyOrderInfoAloneTest")

    public FebsResponse historyOrderInfoAloneTest(ContractOrderEntity contractOrderEntity, QueryRequest request) {

        Map<String, Object> data = getDataTable(tradeManageService.findhistoryOrderInfoAloneTestInfoInPage(contractOrderEntity, request));

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

    }

    



}


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

@@ -102,6 +102,16 @@
    }

    

    /**

     * 历史委托明细--- Test

     * @return

     */

    @GetMapping("historyOrderAloneTest")

    @RequiresPermissions("historyOrderAloneTest:view")

    public String historyOrderAloneTest() {

        return FebsUtil.view("modules/trademanage/historyOrderAloneTest");

    }

    
    /**

     * 全部历史委托明细

     * @return

     */


 src/main/java/com/xcong/excoin/modules/trademanage/mapper/ContractOrderMapper.java

@@ -18,4 +18,7 @@
    IPage<ContractOrderEntity> findHistoryOrderInfoAloneInfoInPage(Page<ContractOrderEntity> page,

            @Param("record") ContractOrderEntity contractOrderEntity);



    IPage<ContractOrderEntity> findhistoryOrderInfoAloneTestInfoInPage(Page<ContractOrderEntity> page,

            @Param("record")ContractOrderEntity contractOrderEntity);



}


 src/main/java/com/xcong/excoin/modules/trademanage/service/TradeManageService.java

@@ -40,4 +40,6 @@
    IPage<ContractHoldOrderEntity> findContractHoldOrderAloneTestInPage(ContractHoldOrderEntity contractHoldOrderEntity,

            QueryRequest request);



    IPage<ContractOrderEntity> findhistoryOrderInfoAloneTestInfoInPage(ContractOrderEntity contractOrderEntity, QueryRequest request);



}


 src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java

@@ -362,6 +362,30 @@
        }

        return findMemberAccountInfoListInPage;

    }



    @Override

    public IPage<ContractOrderEntity> findhistoryOrderInfoAloneTestInfoInPage(ContractOrderEntity contractOrderEntity,

            QueryRequest request) {

        Page<ContractOrderEntity> page = new Page<>(request.getPageNum(), request.getPageSize());

        IPage<ContractOrderEntity> findMemberAccountInfoListInPage = contractHoldOrderMapper.findhistoryOrderInfoAloneTestInfoInPage(page, contractOrderEntity);

        List<ContractOrderEntity> records = findMemberAccountInfoListInPage.getRecords();

        if(records != null && records.size() > 0) {

            for(ContractOrderEntity contractOrderEntitys : records) {

                Long memberId = contractOrderEntitys.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;

                    contractOrderEntitys.setRealName(realName);

                }

            }

        }

        return findMemberAccountInfoListInPage;

    }

    

    

    


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

@@ -72,5 +72,29 @@
        </where>

            order by s.opening_time desc

    </select>

	
    <select id="findhistoryOrderInfoAloneTestInfoInPage" resultType="com.xcong.excoin.modules.trademanage.entity.ContractOrderEntity">

        SELECT

            *

        FROM

            contract_order s

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

        <where>

        s.closing_type in (2,3,4,5,6,7,8,9)

        and (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.closingType!=null and record.closingType!=''">

                    and s.closing_type = #{record.closingType}

                </if>

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

                    and m.account_type= #{record.isTest}

                </if>

            </if>

        </where>

            order by s.opening_time desc

    </select>

    

</mapper>

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

New file
@@ -0,0 +1,216 @@
<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 class="layui-inline">

                                        <label class="layui-form-label layui-form-label-sm">平仓类型</label>

                                        <div class="layui-input-inline">

                                            <select name="closingType">

                                                <option value="0">请选择</option>

                                                <option value="2">平多</option>

                                                <option value="3">平空</option>

                                                <option value="4">爆仓平多</option>

                                                <option value="5">爆仓平空</option>

                                                <option value="6">止盈平多</option>

                                                <option value="7">止盈平空</option>

                                                <option value="8">止损平多</option>

                                                <option value="9">止损平空</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>

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

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

    // 引入组件并初始化

    layui.use(['dropdown', 'jquery', 'laydate', 'form', 'table', 'febs', 'treeSelect'], 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'),

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

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

            tableIns;



        form.render();



        // 表格初始化

        initTable();

        
        // 查询按钮

        $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 + 'tradeManage/historyOrderInfoAlone',

                totalRow: true,

                cols: [[

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

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

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

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

                    {field: 'symbolCnt', title: '手数', minWidth: 80,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: 100,align:'center'},

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

                    {field: 'openingTime', title: '开仓时间', minWidth: 200,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: 'closingPrice', title: '平仓价', minWidth: 100,align:'center'},

                    {field: 'closingTime', title: '平仓时间', minWidth: 200,align:'center'},

                    {field: 'rewardAmount', title: '盈亏金额', 
                        templet: function (d) {

                            if (d.rewardAmount > 0) {

                                return '<span style="color:green;">' + d.rewardAmount + '</span>'

                            }

                            if (d.rewardAmount < 0) {

                                return '<span style="color:red;">' + d.rewardAmount + '</span>'

                            }

                            if (d.rewardAmount == 0 ||  d.rewardAmount == "" || d.rewardAmount == null) {

                                return '<span></span>'

                            }

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

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

                    {field: 'forceClosingPrice', title: '预估强平价', minWidth: 120,align:'center'},

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

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

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

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

                    {field: 'closingFeeAmount', title: '平仓手续费', minWidth: 100,align:'center',totalRow: true},

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

                    {field: 'rewardRatio', title: '盈亏比例', minWidth: 120,align:'center'},

                    {field: 'entrustOpeningPrice', title: '委托开仓价', minWidth: 150,align:'center'},

                    {field: 'entrustTime', title: '委托时间', minWidth: 200,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: 'orderNo', title: '订单编号', minWidth: 200,align:'center'},

                    {field: 'leverRatio', title: '杠杆倍率', minWidth: 120,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: 'email', title: '邮箱', minWidth: 200,align:'left'},

                ]]

            });

        }



        // 获取查询参数

        function getQueryParams() {

            return {

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

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

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

            };

        }

        
    })

</script>