20200813 代码提交

xiaoyong931011

2020-08-13 d6bcc4fe2101077f2a750c8382486629c5da1f66

20200813 代码提交

 src/main/java/com/xcong/excoin/modules/dataMonitoring/entity/DataMonitoringEntity.java

@@ -60,5 +60,15 @@
    

    @TableField(exist = false)

    private String orderType;

    /**

     * 账号类型

     */

    @TableField(exist = false)

    private int accountType;

    /**

     * 查询条件：账号类型

     */

    @TableField(exist = false)

    private String isTest;



}


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

@@ -9,6 +9,9 @@
                <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    


 src/main/resources/templates/febs/views/modules/dataMonitoring/dataMonitoringList.html

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

@@ -128,19 +138,27 @@
                    {field: 'reward', title: '总盈亏', minWidth: 80,align:'left'},

                    {field: 'count', title: '当天订单总数', minWidth: 80,align:'left'},

                    {field: 'countOut', title: '不符合条件的订单数量', minWidth: 100,align:'left'},

                    {field: 'createTime', title: '更新时间', minWidth: 100,align:'left'},

                    {field: 'accountType', title: '账号类型',

                        templet: function (d) {

                            if (d.accountType === 2) {

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

                            } else if (d.accountType === 1) {

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

                            }

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

                    {field: 'type', title: '类别',

                        templet: function (d) {

                            if (d.type === 1) {

                                return '<span style="color:green;">每日开仓数超过30</span>'

                            } else if (d.type === 2) {

                                return '<span style="color:red;">三分钟平仓操作订单超过每日总订单数的50%</span>'

                                return '<span style="color:blue;">三分钟平仓操作订单超过每日总订单数的50%</span>'

                            }else if (d.type === 3) {

                                return '<span style="color:red;">订单总盈亏超过500</span>'

                            }else{

                                return ''

                            }

                        }, minWidth: 200,align:'center'},

                    {field: 'createTime', title: '更新时间', minWidth: 100,align:'left'},

                ]]

            });

        }

@@ -149,6 +167,7 @@
        function getQueryParams() {

            return {

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

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

            };

        }