xiaoyong931011
2021-03-22 7bf394c43fc2e4a4e71d72c1f84af75b717dddd8
20210319  平仓加载中
2 files modified
10 ■■■■ changed files
src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java 3 ●●●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/modules/trademanage/positionSetting.html 7 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java
@@ -39,6 +39,7 @@
import com.xcong.excoin.modules.trademanage.vo.PositionSettingVo;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import lombok.RequiredArgsConstructor;
@@ -1219,6 +1220,8 @@
                }
                positionSettingVo.setSumRewardAmount(sumRewardAmount);
            }
            CollUtil.sortByProperty(records, "sumRewardAmount");
            //CollUtil.sortByProperty(records, "accountType");
        }
        return positionSettingVoIPage;
    }
src/main/resources/templates/febs/views/modules/trademanage/positionSetting.html
@@ -111,13 +111,14 @@
                id: 'userTable',
                url: ctx + 'tradeManage/positionSetting',
                totalRow: true,
                initSort: {field:'createTime', type:'desc'},
                cols: [[
                    {field: 'phone', title: '账号',minWidth: 100,align:'left',totalRowText: '合计'},
                    {field: 'email', title: '邮箱', minWidth: 100,align:'left'},
                    {field: 'realName', title: '姓名', minWidth: 120,align:'left'},
                    {field: 'inviteId', title: '邀请码', minWidth: 120,align:'center'},
                    {field: 'createTime', title: '时间', minWidth: 120,align:'center'},
                    {field: 'sumRewardAmount', title: '持仓总盈亏', minWidth: 120,align:'center'},
                    {field: 'inviteId', title: '邀请码', minWidth: 120,align:'center',sort: true},
                    {field: 'createTime', title: '时间', minWidth: 120,align:'center',sort: true},
                    {field: 'sumRewardAmount', title: '持仓总盈亏', minWidth: 120,align:'center',sort: true},
                    {field: 'pcState', title: '是否可平仓',
                        templet: function (d) {
                            if (d.pcState == 1) {