20210305

xiaoyong931011

2021-03-05 3b58a59878ffa2e0604d5e78285430749418900c

20210305

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

@@ -92,6 +92,9 @@
    private double agentNum;

    @TableField(exist = false)

    private String isok;

    //当前跟随人数

    @TableField(exist = false)

    private String followNumNow;

    



}


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

@@ -16,4 +16,6 @@


    String selectAllProfitByMemberIdAndTraderMemberId(@Param("memberId")long memberId, @Param("traderMemberId")Long traderMemberId);



    String selectFollowNowBytraderId(@Param("traderId")Long traderId);



}


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

@@ -72,6 +72,11 @@
        List<FollowTraderInfoEntity> records = followTraderInfoEntitys.getRecords();

        if(CollUtil.isNotEmpty(records)) {

            for(FollowTraderInfoEntity followTraderInfo : records) {

                //获取当前跟单人数

                Long traderId = followTraderInfo.getId();

                String followNowNumString = followTraderInfoMapper.selectFollowNowBytraderId(traderId);

                followTraderInfo.setFollowNumNow(followNowNumString);

				
                Long memberId = followTraderInfo.getMemberId();

                Map<String, Object> columnMap = new HashMap<>();

                columnMap.put("member_id", memberId);

@@ -269,6 +274,12 @@
        if(ObjectUtil.isEmpty(followNum) || followNum == 0) {

            return new FebsResponse().fail().message("最大跟随人数不能为0");

        }



        String followNumNow = followTraderInfoMapper.selectFollowNowBytraderId(id);

        int parseInt = Integer.parseInt(followNumNow);

        if(parseInt > followNum){

            return new FebsResponse().fail().message("请填写大于当前跟随人数"+parseInt+"的整数");

        }

        //更新【交易员信息表】数据

        selectById.setProfitRatio(profitRatio);

        selectById.setFollowNum(followNum);


 src/main/java/com/xcong/excoin/modules/helpCenter/controller/HelpCenterController.java

@@ -143,9 +143,9 @@
            e.printStackTrace();

        }



        String imageFuffix = ".jpg";

        String imageFuffix = ".png";

        String imageNames = System.currentTimeMillis() + IdUtil.simpleUUID() + imageFuffix;

        String imageName = "uploadeFile/image/" + imageNames;

        String imageName = "uploadeFile/" + imageNames;

        OssUtils.uploadFileWithBase64(base64EncoderImg, imageName);

            String bucket_name ="https://excoin.oss-cn-hangzhou.aliyuncs.com";

            String url = bucket_name + "/" + imageName;


 src/main/java/com/xcong/excoin/modules/systemSetting/service/Impl/SystemSettingServiceImpl.java

@@ -121,7 +121,9 @@
        PlatformBannerEntity platformBannerEntityAdd = new PlatformBannerEntity();

        platformBannerEntityAdd.setCreateBy("admin");

        platformBannerEntityAdd.setCreateTime(new Date());

        String imageUrl = platformBannerEntity.getImageUrl();

        platformBannerEntityAdd.setImageUrl(platformBannerEntity.getImageUrl());



        platformBannerEntityAdd.setIsInside(platformBannerEntity.getIsInside());

        platformBannerEntityAdd.setIsJump(platformBannerEntity.getIsJump());

        platformBannerEntityAdd.setIsTop(platformBannerEntity.getIsTop());


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

@@ -17,6 +17,10 @@
        order by s.create_time desc    

    </select>



    <select id="selectFollowNowBytraderId" resultType="java.lang.String">

        select COUNT(a.id) from follow_follower_setting a where a.trader_id = #{traderId}

    </select>



    <select id="selectProfitRatioTotal" resultType="java.lang.String">

        select IFNULL(SUM(f.amount),'0') as amount from follow_trader_profit_detail f where f.member_id = #{memberId}

    </select>


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

@@ -165,9 +165,11 @@
                    {field: 'phone', title: '手机号', minWidth: 100,align:'left'},

                    {field: 'email', title: '邮箱', minWidth: 100,align:'left'},

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

                    {field: 'nickname', title: '昵称', minWidth: 100,align:'left'},

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

                    {field: 'profitRatio', title: '利润率', minWidth: 80,align:'center'},

                    {field: 'followNum', title: '跟随人数', minWidth: 120,align:'center'},

                    {field: 'followNumNow', title: '当前跟随人数', minWidth: 120,align:'center'},

                    {field: 'followNum', title: '最大跟随人数', minWidth: 120,align:'center'},

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

                        templet: function (d) {

                            if (d.accountType === 2) {


 src/main/resources/templates/febs/views/modules/systemSetting/platformBannerAdd.html

@@ -15,7 +15,9 @@
        top: 1px;

        left: 3px;

    }



    .layui-upload-img{

        max-width: 300px;

    }

</style>

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

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

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

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

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

                <input type="text" name="name" minlength="4" maxlength="10" lay-verify="range|name" 
                <input type="text" name="name" minlength="4" maxlength="500" lay-verify="range|name"

                        autocomplete="off" class="layui-input" >

            </div>

        </div>

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

            <label class="layui-form-label febs-form-item-require">图片链接：</label>

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

            <div class="layui-upload">

                <button type="button" class="layui-btn" id="test1">上传图片</button>

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

                    <div class="layui-upload-list">

                        <img class="layui-upload-img" id="imageUrls" >

                    </div>

                </div>

            </div>

        </div>

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

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

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

                <input type="text" name="imageUrl" minlength="4" maxlength="10"

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

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

            </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="jumpUrl" minlength="4" maxlength="10" 
                <input type="text" name="jumpUrl" minlength="4" maxlength="500"

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

            </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="sort" minlength="4" maxlength="10" 
                <input type="text" name="sort" minlength="4" maxlength="20"

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

            </div>

        </div>

@@ -88,7 +100,7 @@
</div>



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

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

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

        var $ = layui.$,

            febs = layui.febs,

            layer = layui.layer,

@@ -99,8 +111,25 @@
            member = [[${member}]],

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

            validate = layui.validate,

            upload = layui.upload,

            _deptTree;



        //普通图片上传

        var uploadInst = upload.render({

            elem: '#test1'

            ,url: ctx + 'helpCenter/uploadFileBase64' //改成您自己的上传接口

            ,before: function(obj){

                //预读本地文件示例，不支持ie8

                obj.preview(function(index, file, result){

                    $('#imageUrls').attr('src', result); //图片链接（base64）

                });

            }

            ,done: function(res){

                febs.alert.success("成功");

                $("#imageUrl").val(res.src);

            }

        });



        form.render();



        formSelects.render();


 src/main/resources/templates/febs/views/modules/systemSetting/platformBannerDetail.html

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

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

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

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

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

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

            </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="imageUrl" minlength="4" maxlength="10" data-th-id="${member.imageUrl}"

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

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

            </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="jumpUrl" minlength="4" maxlength="10" data-th-id="${member.jumpUrl}"

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

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

            </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="sort" minlength="4" maxlength="10" data-th-id="${member.sort}"

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

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

            </div>

        </div>