20200724 代码提交

xiaoyong931011

2020-07-24 a5ee9fc3d255dc1210bf7e283b594a265118d71f

20200724 代码提交

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

@@ -62,6 +62,20 @@
        if (records != null) {

            for (ContractHoldOrderEntity holdOrderEntity : records) {

                MemberEntity selectById = memberMapper.selectById(holdOrderEntity.getMemberId());

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

                    holdOrderEntity.setRealName(realName);

                }

            	
            	
                // 获取最新价

                BigDecimal newPrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(holdOrderEntity.getSymbol())));

                BigDecimal lotNumber = holdOrderEntity.getSymbolSku();


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

@@ -9,18 +9,13 @@
            contract_hold_order s

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

        <where>

            s.member_id IN (

                SELECT

                    id

                FROM

                    member

                WHERE

                    account_type = '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 s.create_time DESC


 src/main/resources/templates/febs/views/modules/trademanage/contractHoldOrder.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">

@@ -33,14 +43,11 @@
<!-- 表格操作栏 end -->

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

    // 引入组件并初始化

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

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

@@ -62,8 +69,7 @@
        // 刷新按钮

        $reset.on('click', function () {

            $searchForm[0].reset();

            sortObject.type = 'null';

            tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});

            tableIns.reload({where: getQueryParams(), page: {curr: 1}});

        });



        function initTable() {

@@ -74,6 +80,7 @@
                totalRow: true,

                cols: [[

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

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

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

                    {field: 'openingType', title: '开仓类型', 

                        templet: function (d) {

@@ -111,6 +118,14 @@
                    {field: 'stopProfitPrice', title: '止盈价', minWidth: 120,align:'center'},

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

                    {field: 'orderNo', 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: 'email', title: '邮箱', minWidth: 200,align:'left'},

                ]]

            });

@@ -120,6 +135,7 @@
        function getQueryParams() {

            return {

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

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

            };

        }