20200724 代码提交

xiaoyong931011

2020-07-24 1dd3c53ff3383a89635cf322a2308ca61139e082

20200724  代码提交

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

@@ -30,6 +30,8 @@
import com.xcong.excoin.modules.trademanage.mapper.MemberWalletAgentMapper;

import com.xcong.excoin.modules.trademanage.service.TradeManageService;

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



import cn.hutool.core.collection.CollUtil;

import lombok.RequiredArgsConstructor;



@Service

@@ -167,6 +169,22 @@
            QueryRequest request) {

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

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

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

        if(CollUtil.isNotEmpty(records)) {

            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

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


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

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

@@ -49,14 +59,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'),

@@ -89,6 +96,7 @@
                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) {

@@ -180,6 +188,14 @@
                    {field: 'orderNo', title: '订单编号', minWidth: 200,align:'center'},

                    {field: 'symbolSku', title: '币种规格', minWidth: 100,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'},

                ]]

            });

@@ -190,6 +206,7 @@
            return {

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

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

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

            };

        }