From 35086a393d3bf72d69d27fc412006270743d0da7 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 29 Jun 2020 17:12:51 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/agent/entity/MemberEntity.java | 6
src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java | 10 +
src/main/resources/mapper/modules/AgentReturnDao.xml | 16 ++
src/main/java/com/xcong/excoin/modules/agent/mapper/MemberMapper.java | 2
src/main/resources/mapper/modules/MemberMapper.xml | 19 ++
src/main/java/com/xcong/excoin/modules/agent/controller/MemberController.java | 8 +
src/main/java/com/xcong/excoin/modules/contract/mapper/AgentReturnMapper.java | 15 ++
src/main/resources/templates/febs/views/modules/contract/return-list.html | 24 +-
src/main/java/com/xcong/excoin/modules/contract/entity/AgentReturnEntity.java | 72 ++++++++++
src/main/java/com/xcong/excoin/modules/agent/service/impl/MemberServiceImpl.java | 8 +
src/main/java/com/xcong/excoin/modules/contract/controller/ViewController.java | 18 ++
src/main/java/com/xcong/excoin/modules/agent/service/IMemberService.java | 2
src/main/resources/templates/febs/views/modules/contract/assets-list.html | 168 ++++++++++++++++++++++++
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractOrderServiceImpl.java | 14 ++
src/main/java/com/xcong/excoin/modules/contract/service/IContractOrderService.java | 3
15 files changed, 371 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/agent/controller/MemberController.java b/src/main/java/com/xcong/excoin/modules/agent/controller/MemberController.java
index 08cb052..30e276d 100644
--- a/src/main/java/com/xcong/excoin/modules/agent/controller/MemberController.java
+++ b/src/main/java/com/xcong/excoin/modules/agent/controller/MemberController.java
@@ -44,4 +44,12 @@
Map<String, Object> data = getDataTable(memberService.findFeeAmountList(memberEntity, request));
return new FebsResponse().success().data(data);
}
+
+ @GetMapping("getMemberAssets")
+ public FebsResponse getMemberAssets(MemberEntity memberEntity, QueryRequest request) {
+ User user = getCurrentUser();
+ memberEntity.setRefererId(FebsConstant.USER_TYPE_ADMIN.equals(user.getType()) ? FebsConstant.DEFAULT_REFERER_ID : user.getInviteId());
+ Map<String, Object> data = getDataTable(memberService.findMemberAssetList(memberEntity, request));
+ return new FebsResponse().success().data(data);
+ }
}
diff --git a/src/main/java/com/xcong/excoin/modules/agent/entity/MemberEntity.java b/src/main/java/com/xcong/excoin/modules/agent/entity/MemberEntity.java
index c10b0cd..a019deb 100644
--- a/src/main/java/com/xcong/excoin/modules/agent/entity/MemberEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/agent/entity/MemberEntity.java
@@ -159,4 +159,10 @@
private BigDecimal holdFeeAmount;
@TableField(exist = false)
private BigDecimal loseOrProfit;
+ @TableField(exist = false)
+ private BigDecimal contractTotal;
+ @TableField(exist = false)
+ private BigDecimal coinTotal;
+ @TableField(exist = false)
+ private BigDecimal agentTotal;
}
diff --git a/src/main/java/com/xcong/excoin/modules/agent/mapper/MemberMapper.java b/src/main/java/com/xcong/excoin/modules/agent/mapper/MemberMapper.java
index 721c6e8..289fec8 100644
--- a/src/main/java/com/xcong/excoin/modules/agent/mapper/MemberMapper.java
+++ b/src/main/java/com/xcong/excoin/modules/agent/mapper/MemberMapper.java
@@ -17,4 +17,6 @@
MemberEntity selectMemberByInviteIdAndRefererId(@Param("inviteId") String inviteId, @Param("refererId") String refererId);
IPage<MemberEntity> selectMemberFeeAmountTotal(Page<MemberEntity> page, @Param("record") MemberEntity memberEntity);
+
+ IPage<MemberEntity> selectMemberAssetsList(Page<MemberEntity> page, @Param("record") MemberEntity memberEntity);
}
diff --git a/src/main/java/com/xcong/excoin/modules/agent/service/IMemberService.java b/src/main/java/com/xcong/excoin/modules/agent/service/IMemberService.java
index 516eda8..972a07f 100644
--- a/src/main/java/com/xcong/excoin/modules/agent/service/IMemberService.java
+++ b/src/main/java/com/xcong/excoin/modules/agent/service/IMemberService.java
@@ -13,4 +13,6 @@
IPage<MemberEntity> findMemberListInPage(MemberEntity memberEntity, QueryRequest request);
IPage<MemberEntity> findFeeAmountList(MemberEntity memberEntity, QueryRequest request);
+
+ IPage<MemberEntity> findMemberAssetList(MemberEntity memberEntity, QueryRequest request);
}
diff --git a/src/main/java/com/xcong/excoin/modules/agent/service/impl/MemberServiceImpl.java b/src/main/java/com/xcong/excoin/modules/agent/service/impl/MemberServiceImpl.java
index ef197d1..ceab7ed 100644
--- a/src/main/java/com/xcong/excoin/modules/agent/service/impl/MemberServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/agent/service/impl/MemberServiceImpl.java
@@ -26,6 +26,12 @@
@Override
public IPage<MemberEntity> findFeeAmountList(MemberEntity memberEntity, QueryRequest request) {
Page<MemberEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
- return this.baseMapper.selectMemberListInPage(page, memberEntity);
+ return this.baseMapper.selectMemberFeeAmountTotal(page, memberEntity);
+ }
+
+ @Override
+ public IPage<MemberEntity> findMemberAssetList(MemberEntity memberEntity, QueryRequest request) {
+ Page<MemberEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+ return this.baseMapper.selectMemberAssetsList(page, memberEntity);
}
}
diff --git a/src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java b/src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java
index 1026d32..ceee344 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java
@@ -4,6 +4,7 @@
import com.xcong.excoin.common.entity.FebsConstant;
import com.xcong.excoin.common.entity.FebsResponse;
import com.xcong.excoin.common.entity.QueryRequest;
+import com.xcong.excoin.modules.contract.entity.AgentReturnEntity;
import com.xcong.excoin.modules.contract.entity.ContractHoldOrderEntity;
import com.xcong.excoin.modules.contract.entity.ContractOrderEntity;
import com.xcong.excoin.modules.contract.service.IContractHoldOrderService;
@@ -57,4 +58,13 @@
Map<String, Object> data = getDataTable(contractOrderService.findHistoryOrderListInPage(contractOrderEntity, request));
return new FebsResponse().success().data(data);
}
+
+ @GetMapping("getReturnList")
+ public FebsResponse getReturnList(AgentReturnEntity agentReturnEntity, QueryRequest request) {
+ User user = getCurrentUser();
+ agentReturnEntity.setReturnInviteId(FebsConstant.USER_TYPE_ADMIN.equals(user.getType()) ? FebsConstant.DEFAULT_REFERER_ID : user.getInviteId());
+
+ Map<String, Object> data = getDataTable(contractOrderService.findAgentReturnList(agentReturnEntity, request));
+ return new FebsResponse().success().data(data);
+ }
}
diff --git a/src/main/java/com/xcong/excoin/modules/contract/controller/ViewController.java b/src/main/java/com/xcong/excoin/modules/contract/controller/ViewController.java
index 827ccc2..cec326d 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/controller/ViewController.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/controller/ViewController.java
@@ -38,4 +38,22 @@
public String historyList() {
return FebsUtil.view("modules/contract/history-list");
}
+
+ @GetMapping("feeAmount")
+ @RequiresPermissions("fee:view")
+ public String feeAmount() {
+ return FebsUtil.view("modules/contract/totalFee-list");
+ }
+
+ @GetMapping("assets")
+ @RequiresPermissions("assets:view")
+ public String memberAssets() {
+ return FebsUtil.view("modules/contract/assets-list");
+ }
+
+ @GetMapping("returnMoney")
+ @RequiresPermissions("return:view")
+ public String returnMoney() {
+ return FebsUtil.view("modules/contract/return-list");
+ }
}
diff --git a/src/main/java/com/xcong/excoin/modules/contract/entity/AgentReturnEntity.java b/src/main/java/com/xcong/excoin/modules/contract/entity/AgentReturnEntity.java
new file mode 100644
index 0000000..ec79197
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/contract/entity/AgentReturnEntity.java
@@ -0,0 +1,72 @@
+package com.xcong.excoin.modules.contract.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.xcong.excoin.common.entity.BaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author wzy
+ * @date 2020-05-31
+ **/
+@Data
+@TableName("agent_return")
+public class AgentReturnEntity extends BaseEntity {
+
+ /**
+ * 订单类型 开仓
+ */
+ public static final int ORDER_TYPE_OPEN = 1;
+
+ /**
+ * 订单类型 平仓
+ */
+ public static final int ORDER_TYPE_CLOSE = 2;
+
+ /**
+ * 订单类型 持仓
+ */
+ public static final int ORDER_TYPE_HOLD = 3;
+
+ private Long memberId;
+
+ private Long orderId;
+
+ private String orderNo;
+
+ private int orderType;
+
+ private BigDecimal closingFeeAmount;
+
+ private BigDecimal holdingFeeAmount;
+
+ private BigDecimal openingFeeAmount;
+
+ private BigDecimal returnAmount;
+
+ private Long refererId;
+
+ private String inviteId;
+
+ private BigDecimal returnRatio;
+
+ private BigDecimal childReturnRatio;
+
+ /**
+ * 0-否1-是
+ */
+ private int isReturn;
+
+ private String returnSymbol;
+
+ private int closingType;
+
+ @TableField(exist = false)
+ private String returnInviteId;
+ @TableField(exist = false)
+ private String phone;
+ @TableField(exist = false)
+ private String email;
+}
diff --git a/src/main/java/com/xcong/excoin/modules/contract/mapper/AgentReturnMapper.java b/src/main/java/com/xcong/excoin/modules/contract/mapper/AgentReturnMapper.java
new file mode 100644
index 0000000..45b8607
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/contract/mapper/AgentReturnMapper.java
@@ -0,0 +1,15 @@
+package com.xcong.excoin.modules.contract.mapper;
+
+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.contract.entity.AgentReturnEntity;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @author helius
+ */
+public interface AgentReturnMapper extends BaseMapper<AgentReturnEntity> {
+
+ IPage<AgentReturnEntity> selectAgentReturnList(Page<AgentReturnEntity> page,@Param("record") AgentReturnEntity agentReturnEntity);
+}
diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/IContractOrderService.java b/src/main/java/com/xcong/excoin/modules/contract/service/IContractOrderService.java
index 63d2c3f..eb6d315 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/IContractOrderService.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/IContractOrderService.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.xcong.excoin.common.entity.QueryRequest;
+import com.xcong.excoin.modules.contract.entity.AgentReturnEntity;
import com.xcong.excoin.modules.contract.entity.ContractOrderEntity;
/**
@@ -11,4 +12,6 @@
public interface IContractOrderService extends IService<ContractOrderEntity> {
IPage<ContractOrderEntity> findHistoryOrderListInPage(ContractOrderEntity contractOrderEntity, QueryRequest request);
+
+ IPage<AgentReturnEntity> findAgentReturnList(AgentReturnEntity agentReturnEntity, QueryRequest request);
}
diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractOrderServiceImpl.java
index 7abd971..055633d 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractOrderServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractOrderServiceImpl.java
@@ -4,21 +4,35 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xcong.excoin.common.entity.QueryRequest;
+import com.xcong.excoin.modules.contract.entity.AgentReturnEntity;
import com.xcong.excoin.modules.contract.entity.ContractOrderEntity;
+import com.xcong.excoin.modules.contract.mapper.AgentReturnMapper;
import com.xcong.excoin.modules.contract.mapper.ContractOrderMapper;
import com.xcong.excoin.modules.contract.service.IContractOrderService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
/**
* @author wzy
* @date 2020-06-19
**/
+@Slf4j
@Service
+@RequiredArgsConstructor
public class ContractOrderServiceImpl extends ServiceImpl<ContractOrderMapper, ContractOrderEntity> implements IContractOrderService {
+
+ private final AgentReturnMapper agentReturnMapper;
@Override
public IPage<ContractOrderEntity> findHistoryOrderListInPage(ContractOrderEntity contractOrderEntity, QueryRequest request) {
Page<ContractOrderEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.baseMapper.selectHistoryOrderListInPage(page, contractOrderEntity);
}
+
+ @Override
+ public IPage<AgentReturnEntity> findAgentReturnList(AgentReturnEntity agentReturnEntity, QueryRequest request) {
+ Page<AgentReturnEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+ return agentReturnMapper.selectAgentReturnList(page, agentReturnEntity);
+ }
}
diff --git a/src/main/resources/mapper/modules/AgentReturnDao.xml b/src/main/resources/mapper/modules/AgentReturnDao.xml
new file mode 100644
index 0000000..9b73a76
--- /dev/null
+++ b/src/main/resources/mapper/modules/AgentReturnDao.xml
@@ -0,0 +1,16 @@
+<?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.contract.mapper.AgentReturnMapper">
+
+ <select id="selectAgentReturnList" resultType="com.xcong.excoin.modules.contract.entity.AgentReturnEntity">
+ select
+ CONCAT(b.first_name, b.second_name) account,
+ a.*,
+ c.phone,
+ c.email
+ from kss_framework.agent_return a
+ left join member_authentication b on a.member_id=b.member_id
+ left join member c on a.member_id=c.id
+ where return_invite_id=#{record.returnInviteId}
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/modules/MemberMapper.xml b/src/main/resources/mapper/modules/MemberMapper.xml
index 172a8f7..877f35e 100644
--- a/src/main/resources/mapper/modules/MemberMapper.xml
+++ b/src/main/resources/mapper/modules/MemberMapper.xml
@@ -58,4 +58,23 @@
group by a.create_time,a.phone, a.email
order by a.create_time desc
</select>
+
+ <select id="selectMemberAssetsList" resultType="com.xcong.excoin.modules.agent.entity.MemberEntity">
+ select
+ CONCAT(e.first_name, e.second_name) account,
+ a.phone,
+ a.email,
+ a.invite_id,
+ a.referer_id,
+ b.total_balance contractTotal,
+ c.total_balance coinTotal,
+ d.total_balance agentTotal
+ from kss_framework.member a
+ left join member_wallet_contract b on a.id=b.member_id
+ left join member_wallet_coin c on a.id=c.member_id and c.wallet_code='USDT'
+ left join member_wallet_agent d on a.id=d.member_id
+ left join member_authentication e on a.id=e.member_id
+ where find_in_set(#{record.refererId}, a.referer_ids)
+ order by a.create_time desc
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/modules/contract/assets-list.html b/src/main/resources/templates/febs/views/modules/contract/assets-list.html
new file mode 100644
index 0000000..83a9e73
--- /dev/null
+++ b/src/main/resources/templates/febs/views/modules/contract/assets-list.html
@@ -0,0 +1,168 @@
+<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">
+ <input type="text" name="createTime" id="user-createTime"
+ 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="accountType">
+ <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="accountStatus">
+ <option value=""></option>
+ <option value="0">禁用</option>
+ <option value="1">正常</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="certifyStatus">
+ <option value=""></option>
+ <option value="0">未通过</option>
+ <option value="1">审核中</option>
+ <option value="2">审核通过</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"></i>
+ </div>
+ <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action"
+ id="reset">
+ <i class="layui-icon"></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="open-type">
+ {{#
+ var openType = {
+ 1: {title: '开多', color : 'blue'},
+ 2: {title: '开空', color : 'red'}
+ }[d.openingType];
+ }}
+ <span class="layui-badge febs-bg-{{openType.color}}">{{ openType.title }}</span>
+</script>
+<!-- 表格字段状态格式化 start -->
+
+<script data-th-inline="none" type="text/javascript">
+ // 引入组件并初始化
+ layui.use(['dropdown', 'jquery', 'laydate', 'form', 'table', 'febs', 'treeSelect'], 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,
+ createTimeFrom,
+ createTimeTo;
+
+ form.render();
+
+ // 表格初始化
+ initTable();
+
+ // 时间组件
+ laydate.render({
+ elem: '#user-createTime',
+ range: true,
+ trigger: '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();
+ sortObject.type = 'null';
+ createTimeTo = null;
+ createTimeFrom = null;
+ tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});
+ });
+
+ function initTable() {
+ tableIns = febs.table.init({
+ elem: $view.find('table'),
+ id: 'userTable',
+ url: ctx + 'member/getMemberAssets',
+ cols: [[
+ {type: 'checkbox'},
+ {field: 'account', title: '用户姓名', minWidth: 150, align: 'center'},
+ {field: 'inviteId', title: '代理UID', minWidth: 150, align: 'center'},
+ {field: 'refererId', title: '上级UID', minWidth: 100, align: 'center'},
+ {field: 'phone', title: '联系方式', minWidth: 130, align: 'center'},
+ {field: 'email', title: '邮箱', minWidth: 100, align: 'center'},
+ {field: 'contractTotal', title: '开仓手续费', minWidth: 140, align: 'center'},
+ {field: 'coinTotal', title: '平仓手续费', minWidth: 140, align: 'center'},
+ {field: 'agentTotal', title: '持仓手续费', minWidth: 140, align: 'center'}
+ ]]
+ });
+ }
+
+ // 获取查询参数
+ function getQueryParams() {
+ var createTime = $searchForm.find('input[name="createTime"]').val();
+ if (createTime) {
+ createTimeFrom = createTime.split(' - ')[0];
+ createTimeTo = createTime.split(' - ')[1];
+ }
+ return {
+ startTime: createTimeFrom,
+ endTime: createTimeTo,
+ account: $searchForm.find('input[name="account"]').val().trim(),
+ accountStatus: $searchForm.find("select[name='accountStatus']").val(),
+ accountType: $searchForm.find("select[name='accountType']").val(),
+ certifyStatus: $searchForm.find("select[name='certifyStatus']").val(),
+ invalidate_ie_cache: new Date()
+ };
+ }
+ })
+</script>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/modules/contract/return-list.html b/src/main/resources/templates/febs/views/modules/contract/return-list.html
index cb0a150..7462de4 100644
--- a/src/main/resources/templates/febs/views/modules/contract/return-list.html
+++ b/src/main/resources/templates/febs/views/modules/contract/return-list.html
@@ -132,24 +132,22 @@
tableIns = febs.table.init({
elem: $view.find('table'),
id: 'userTable',
- url: ctx + 'order/getHoldList',
+ url: ctx + 'order/getReturnList',
cols: [[
{type: 'checkbox'},
{field: 'orderNo', title: '订单编号', minWidth: 150, align: 'center'},
- {field: 'symbol', title: '币种', minWidth: 100, align: 'center'},
+ {field: 'returnSymbol', title: '币种', minWidth: 100, align: 'center'},
{field: 'refererId', title: '上级UID', minWidth: 100, align: 'center'},
- {field: 'telphone', title: '联系方式', minWidth: 130, align: 'center'},
+ {field: 'phone', title: '联系方式', minWidth: 130, align: 'center'},
{field: 'email', title: '邮箱', minWidth: 100, align: 'center'},
- {title: '开仓类型', templet: '#open-type', minWidth: 100, align: 'center'},
- {field: 'leverRatio', title: '杠杆倍率', minWidth: 100, align: 'center'},
- {field: 'openingPrice', title: '开仓均价', minWidth: 120, align: 'center'},
- {field: 'symbolCnt', title: '持仓数', minWidth: 100, align: 'center'},
- {field: 'symbolCntSale', title: '可平数', minWidth: 100, align: 'center'},
- {field: 'forceClosingPrice', title: '预估强平价', minWidth: 130, align: 'center'},
- {field: 'bondAmount', title: '保证金', minWidth: 130, align: 'center'},
- {field: 'createTime', title: '开仓时间', minWidth: 160, align: 'center'},
- {field: 'loseOrProfit', title: '盈亏', minWidth: 140, align: 'center', fixed : "right"},
- {field: 'returnRatio', title: '回报率', minWidth: 140, align: 'center', fixed : "right"},
+ {field: 'orderType', title: '订单类型', minWidth: 100, align: 'center'},
+ {field: 'returnSymbol', title: '返佣币种', minWidth: 120, align: 'center'},
+ {field: 'createTime', title: '返佣时间', minWidth: 100, align: 'center'},
+ {field: 'closingType', title: '类型', minWidth: 100, align: 'center'},
+ {field: 'closingFeeAmount', title: '平仓手续费', minWidth: 130, align: 'center'},
+ {field: 'holdingFeeAmount', title: '持仓手续费', minWidth: 130, align: 'center'},
+ {field: 'openingFeeAmount', title: '开仓手续费', minWidth: 160, align: 'center'},
+ {field: 'returnAmount', title: '返佣佣金', minWidth: 140, align: 'center', fixed : "right"},
]]
});
}
--
Gitblit v1.9.1