Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin_manage

Helius

2021-02-05 311322c7f97dbedb3f51deb99827633252a1f016

Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin_manage

 src/main/java/com/xcong/excoin/modules/documentary/controller/DocumentaryController.java

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

import com.xcong.excoin.modules.documentary.dto.FollowTraderInfoDto;

import com.xcong.excoin.modules.documentary.entity.FollowTraderInfoEntity;

import com.xcong.excoin.modules.documentary.entity.FollowTraderLabelEntity;

import com.xcong.excoin.modules.documentary.service.DocumentaryService;

import com.xcong.excoin.modules.systemSetting.entity.PlatformBannerEntity;



import lombok.RequiredArgsConstructor;

import lombok.extern.slf4j.Slf4j;

@@ -33,6 +35,46 @@
    private final DocumentaryService documentaryService;

    

    /**

     * 标签---列表

     * @return

     */

    @GetMapping("traderLabelList")

    public FebsResponse traderLabelList(FollowTraderLabelEntity followTraderLabelEntity, QueryRequest request) {

        Map<String, Object> data = getDataTable(documentaryService.traderLabelList(followTraderLabelEntity, request));

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

    }

	
    /**

     * 标签---删除

     * @return

     */

    @GetMapping("traderLabelDelete/{id}")

    @ControllerEndpoint(operation = "标签---删除", exceptionMessage = "删除失败")

    public FebsResponse traderLabelDelete(@NotNull(message = "{required}") @PathVariable Long id) {

        return documentaryService.traderLabelDelete(id);

    }

    
    /**

     * 标签---新增

     */

    @PostMapping("followLabelSetAdd")

    @ControllerEndpoint(operation = "标签---新增", exceptionMessage = "新增失败")

    public FebsResponse followLabelSetAdd(@Valid FollowTraderLabelEntity followTraderLabelEntity) {

        documentaryService.followLabelSetAdd(followTraderLabelEntity);

        return new FebsResponse().success();

    }

    
    /**

     * 标签---修改

     */

    @PostMapping("followLabelSetUpdate")

    @ControllerEndpoint(operation = "标签---修改", exceptionMessage = "修改失败")

    public FebsResponse followLabelSetUpdate(@Valid FollowTraderLabelEntity followTraderLabelEntity) {

        documentaryService.followLabelSetUpdate(followTraderLabelEntity);

        return new FebsResponse().success();

    }

	
    /**

     * 交易员申请---列表

     * @return

     */


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

@@ -11,8 +11,11 @@
import com.xcong.excoin.common.entity.FebsConstant;

import com.xcong.excoin.common.utils.FebsUtil;

import com.xcong.excoin.modules.documentary.entity.FollowTraderInfoEntity;

import com.xcong.excoin.modules.documentary.entity.FollowTraderLabelEntity;

import com.xcong.excoin.modules.documentary.mapper.FollowTraderLabelMapper;

import com.xcong.excoin.modules.documentary.service.DocumentaryService;

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

import com.xcong.excoin.modules.systemSetting.entity.PlatformTradeSettingEntity;



import lombok.RequiredArgsConstructor;

@Controller("documentaryView")

@@ -22,6 +25,38 @@
    

    private final DocumentaryService documentaryService;

    

    private final FollowTraderLabelMapper followTraderLabelMapper;

	
    /**

     * 标签设置

     * @return

     */

    @GetMapping("followLabelSet")

    @RequiresPermissions("followLabelSet:view")

    public String followLabelSet() {

        return FebsUtil.view("modules/documentary/followLabelSet");

    }

	
    /**

     * 标签设置---修改

     */

    @GetMapping("followLabelSetUpdate/{id}")

    @RequiresPermissions("followLabelSetUpdate:update")

    public String followLabelSetUpdate(@PathVariable long id, Model model) {

        FollowTraderLabelEntity data = followTraderLabelMapper.selectById(id);

        model.addAttribute("member", data);

        return FebsUtil.view("modules/documentary/followLabelSetDetail");

    }

    
    /**

     * 标签设置---新增

     */

    @GetMapping("followLabelSetAdd")

    @RequiresPermissions("followLabelSetAdd:add")

    public String noticeManageAdd() {

        return FebsUtil.view("modules/documentary/followLabelSetAdd");

    }

    
    /**

     * 交易员申请

     * @return


 src/main/java/com/xcong/excoin/modules/documentary/entity/FollowTraderLabelEntity.java

New file
@@ -0,0 +1,26 @@
package com.xcong.excoin.modules.documentary.entity;



import com.baomidou.mybatisplus.annotation.IdType;

import com.baomidou.mybatisplus.annotation.TableId;

import com.baomidou.mybatisplus.annotation.TableName;

import com.xcong.excoin.common.entity.BaseEntity;



import lombok.Data;

@Data

@TableName("follow_trader_label")

public class FollowTraderLabelEntity{

	
    /**

     * 
     */

    private static final long serialVersionUID = 1L;

	
    @TableId(value = "id",type = IdType.AUTO)

    private Long id;

    /**

     * 标签

     */

    private String labels;



}




 src/main/java/com/xcong/excoin/modules/documentary/mapper/FollowTraderLabelMapper.java

New file
@@ -0,0 +1,15 @@
package com.xcong.excoin.modules.documentary.mapper;



import org.apache.ibatis.annotations.Param;



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.documentary.entity.FollowTraderLabelEntity;



public interface FollowTraderLabelMapper extends BaseMapper<FollowTraderLabelEntity> {



    IPage<FollowTraderLabelEntity> findFollowTraderLabelEntitysInPage(Page<FollowTraderLabelEntity> page,

            @Param("record")FollowTraderLabelEntity followTraderLabelEntity);



}


 src/main/java/com/xcong/excoin/modules/documentary/service/DocumentaryService.java

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

import com.xcong.excoin.modules.documentary.dto.FollowTraderInfoDto;

import com.xcong.excoin.modules.documentary.entity.FollowTraderInfoEntity;

import com.xcong.excoin.modules.documentary.entity.FollowTraderLabelEntity;



public interface DocumentaryService extends IService<FollowTraderInfoEntity> {



@@ -22,4 +23,12 @@


    FebsResponse traderGetFull(@NotNull(message = "{required}") Long id);



    IPage<FollowTraderLabelEntity> traderLabelList(FollowTraderLabelEntity followTraderLabelEntity, QueryRequest request);



    FebsResponse traderLabelDelete(@NotNull(message = "{required}") Long id);



    void followLabelSetAdd(@Valid FollowTraderLabelEntity followTraderLabelEntity);



    void followLabelSetUpdate(@Valid FollowTraderLabelEntity followTraderLabelEntity);



}


 src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java

@@ -21,8 +21,10 @@
import com.xcong.excoin.common.entity.QueryRequest;

import com.xcong.excoin.modules.documentary.dto.FollowTraderInfoDto;

import com.xcong.excoin.modules.documentary.entity.FollowTraderInfoEntity;

import com.xcong.excoin.modules.documentary.entity.FollowTraderLabelEntity;

import com.xcong.excoin.modules.documentary.entity.FollowTraderProfitInfoEntity;

import com.xcong.excoin.modules.documentary.mapper.FollowTraderInfoMapper;

import com.xcong.excoin.modules.documentary.mapper.FollowTraderLabelMapper;

import com.xcong.excoin.modules.documentary.mapper.FollowTraderProfitInfoMapper;

import com.xcong.excoin.modules.documentary.service.DocumentaryService;

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

@@ -41,6 +43,8 @@
public class DocumentaryServiceImpl extends ServiceImpl<FollowTraderInfoMapper, FollowTraderInfoEntity> implements DocumentaryService {

    

    private final FollowTraderInfoMapper followTraderInfoMapper;

	
    private final FollowTraderLabelMapper followTraderLabelMapper;

    

    private final MemberAuthenticationMapper memberAuthenticationMapper;

    

@@ -183,4 +187,29 @@
        return new FebsResponse().success();

    }



    @Override

    public IPage<FollowTraderLabelEntity> traderLabelList(FollowTraderLabelEntity followTraderLabelEntity,

            QueryRequest request) {

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

        IPage<FollowTraderLabelEntity> followTraderLabelEntitys = followTraderLabelMapper.findFollowTraderLabelEntitysInPage(page, followTraderLabelEntity);

        return followTraderLabelEntitys;

    }



    @Override

    public FebsResponse traderLabelDelete(@NotNull(message = "{required}") Long id) {

        followTraderLabelMapper.deleteById(id);

        return new FebsResponse().success();

    }



    @Override

    public void followLabelSetAdd(@Valid FollowTraderLabelEntity followTraderLabelEntity) {

		
        followTraderLabelMapper.insert(followTraderLabelEntity);

    }



    @Override

    public void followLabelSetUpdate(@Valid FollowTraderLabelEntity followTraderLabelEntity) {

        followTraderLabelMapper.updateById(followTraderLabelEntity);

    }



}


 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("memberBoBi")

    @RequiresPermissions("memberBoBi:view")

    public String memberBoBiList() {

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

    }

	
    /**

     * 代理关系

     * @return

     */


 src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java

@@ -143,7 +143,6 @@
    /**

     * 是否是交易员1是2否

     */

    @TableField(exist = false)

    private Integer isTrader;



    /**


 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/FollowTraderLabelMapper.xml

New file
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>

<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">

<mapper namespace="com.xcong.excoin.modules.documentary.mapper.FollowTraderLabelMapper">



    <select id="findFollowTraderLabelEntitysInPage" resultType="com.xcong.excoin.modules.documentary.entity.FollowTraderLabelEntity">

         select * from follow_trader_label s

    </select>

    
</mapper>

 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/documentary/followLabelSet.html

New file
@@ -0,0 +1,127 @@
<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-md2 layui-col-sm12 layui-col-xs12 table-action-area">

                                    <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="add">

                                        新增

                                    </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="edit" shiro:hasPermission="user:update">编辑

        <i class="layui-icon febs-edit-area febs-blue"></i>

     </a>

    <a lay-event="delete" shiro:hasPermission="user:update">删除

        <i class="layui-icon febs-edit-area febs-blue"></i>

     </a>

</script>

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

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

    // 引入组件并初始化

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

        var $ = layui.jquery,

            laydate = layui.laydate,

            febs = layui.febs,

            form = layui.form,

            table = layui.table,

            dropdown = layui.dropdown,

            $view = $('#febs-user'),

            $reset = $view.find('#reset'),

            $add = $view.find('#add'),

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

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

            tableIns

            ;



        form.render();



        // 表格初始化

        initTable();



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

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

            var data = obj.data,

                layEvent = obj.event;

            
            if (layEvent === 'edit') {

                febs.modal.open('修改', 'modules/documentary/followLabelSetUpdate/' + data.id, {

                    btn: ['提交', '取消'],

                    yes: function (index, layero) {

                        $('#user-update').find('#submit').trigger('click');

                    },

                    btn2: function () {

                        layer.closeAll();

                    }

                });

            }

            if (layEvent === 'delete') {

                febs.modal.confirm('删除', '您是否确认删除？', function () {

                    deleteUsers(data.id);

                });

            }

        });

        
        function deleteUsers(id) {

            febs.get(ctx + 'documentary/traderLabelDelete/' + id, null, function () {

                febs.alert.success('确认删除');

                $reset.click();

            });

        }

        
         // 刷新按钮

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

            $searchForm[0].reset();

            sortObject.type = 'null';

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

        });

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

            febs.modal.open('新增', 'modules/documentary/followLabelSetAdd/', {

                btn: ['提交', '取消'],

                yes: function (index, layero) {

                    $('#user-add').find('#submit').trigger('click');

                },

                btn2: function () {

                    layer.closeAll();

                }

            });

        });



     	
         // 获取查询参数

        function getQueryParams() {

            return {};

        }

        
        function initTable() {

            tableIns = febs.table.init({

                elem: $view.find('table'),

                id: 'userTable',

                url: ctx + 'documentary/traderLabelList',

                cols: [[

                    {field: 'id', title: '', minWidth: 10,align:'center'},

                    {field: 'labels', title: '更新内容', minWidth: 120,align:'center'},

                    {title: '操作', toolbar: '#user-option', minWidth: 140, fixed : 'right'}

                ]]

            });

        }

    })

</script>

 src/main/resources/templates/febs/views/modules/documentary/followLabelSetAdd.html

New file
@@ -0,0 +1,67 @@
<style>

    #user-add {

        padding: 20px 25px 25px 0;

    }



    #user-add .layui-treeSelect .ztree li a, .ztree li span {

        margin: 0 0 2px 3px !important;

    }

    #user-add #data-permission-tree-block {

        border: 1px solid #eee;

        border-radius: 2px;

        padding: 3px 0;

    }

    #user-add .layui-treeSelect .ztree li span.button.switch {

        top: 1px;

        left: 3px;

    }



</style>

<div class="layui-fluid" id="user-add">

    <form class="layui-form" action="" lay-filter="user-add-form">

        <div class="layui-form-item febs-hide">

            <label class="layui-form-label febs-form-item-require">id：</label>

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

                <input type="text" name="id">

            </div>

        </div>

        <div class="layui-form-item">

            <label class="layui-form-label febs-form-item-require">标签内容：</label>

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

                <input type="text" name="labels" lay-verify="range|labels" 
                        autocomplete="off" class="layui-input" >

            </div>

        </div>

        <div class="layui-form-item febs-hide">

            <button class="layui-btn" lay-submit="" lay-filter="user-add-form-submit" id="submit"></button>

        </div>

    </form>

</div>



<script data-th-inline="javascript">

    layui.use(['febs', 'form', 'formSelects', 'validate', 'treeSelect', 'eleTree'], function () {

        var $ = layui.$,

            febs = layui.febs,

            layer = layui.layer,

            formSelects = layui.formSelects,

            treeSelect = layui.treeSelect,

            form = layui.form,

            eleTree = layui.eleTree,

            $view = $('#user-add'),

            validate = layui.validate,

            _deptTree;



        form.render();



        formSelects.render();



        form.on('submit(user-add-form-submit)', function (data) {

            febs.post(ctx + 'documentary/followLabelSetAdd', data.field, function () {

                layer.closeAll();

                febs.alert.success('新增成功');

                $('#febs-user').find('#reset').click();

            });

            return false;

        });

    });

</script>

 src/main/resources/templates/febs/views/modules/documentary/followLabelSetDetail.html

New file
@@ -0,0 +1,77 @@
<style>

    #user-update {

        padding: 20px 25px 25px 0;

    }



    #user-update .layui-treeSelect .ztree li a, .ztree li span {

        margin: 0 0 2px 3px !important;

    }

    #user-update #data-permission-tree-block {

        border: 1px solid #eee;

        border-radius: 2px;

        padding: 3px 0;

    }

    #user-add .layui-treeSelect .ztree li span.button.switch {

        top: 1px;

        left: 3px;

    }



</style>

<div class="layui-fluid" id="user-update">

    <form class="layui-form" action="" lay-filter="user-update-form">

        <div class="layui-form-item febs-hide">

            <label class="layui-form-label febs-form-item-require">id：</label>

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

                 <input type="text" name="id" data-th-value="${member.id}" >

            </div>

        </div>

        <div class="layui-form-item">

            <label class="layui-form-label febs-form-item-require">标签内容：</label>

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

                <input type="text" name="labels" data-th-id="${member.labels}"  lay-verify="range|labels" 
                        autocomplete="off" class="layui-input" >

            </div>

        </div>

        <div class="layui-form-item febs-hide">

            <button class="layui-btn" lay-submit="" lay-filter="user-update-form-submit" id="submit"></button>

        </div>

    </form>

</div>



<script data-th-inline="javascript">

    layui.use(['febs', 'form', 'formSelects', 'validate', 'treeSelect', 'eleTree'], function () {

        var $ = layui.$,

            febs = layui.febs,

            layer = layui.layer,

            formSelects = layui.formSelects,

            treeSelect = layui.treeSelect,

            form = layui.form,

            eleTree = layui.eleTree,

            member = [[${member}]],

            $view = $('#user-update'),

            validate = layui.validate,

            _deptTree;



        form.render();



        initUserValue();



        formSelects.render();



        function initUserValue() {

            form.val("user-update-form", {

                "labels": member.labels,

                "id": member.id

            });

        }



        form.on('submit(user-update-form-submit)', function (data) {

            febs.post(ctx + 'documentary/followLabelSetUpdate', data.field, function () {

                layer.closeAll();

                febs.alert.success('设置成功');

                $('#febs-user').find('#reset').click();

            });

            return false;

        });

    });

</script>

 src/main/resources/templates/febs/views/modules/documentary/traderDetail.html

@@ -28,7 +28,7 @@
        <div class="layui-form-item">

            <label class="layui-form-label">利润率：</label>

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

                <input type="text" name="profitRatio" minlength="4" maxlength="10" data-th-id="${member.profitRatio}"

                <input type="text" name="profitRatio" data-th-id="${member.profitRatio}"

                       lay-verify="range|profitRatio" autocomplete="off" class="layui-input" readonly>

            </div>

        </div>


 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'},