From 7d32625de376f2993129314397e7366f4b34e5c9 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sun, 19 Jul 2020 19:33:44 +0800
Subject: [PATCH] 20200719 代码提交
---
src/main/resources/templates/febs/views/modules/trademanage/historyOrderAlone.html | 196 ++++++++++++++++
src/main/java/com/xcong/excoin/modules/trademanage/mapper/ContractOrderMapper.java | 3
src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java | 49 ++++
src/main/resources/templates/febs/views/modules/trademanage/contractHoldOrderAlone.html | 126 ++++++++++
src/main/resources/mapper/modules/ContractOrderMapper.xml | 21 +
src/main/java/com/xcong/excoin/modules/trademanage/mapper/ContractHoldOrderEntityMapper.java | 31 +-
src/main/java/com/xcong/excoin/modules/trademanage/controller/TradeManageController.java | 16 +
src/main/java/com/xcong/excoin/modules/trademanage/service/TradeManageService.java | 66 ++--
src/main/java/com/xcong/excoin/modules/trademanage/controller/ViewController.java | 173 ++++++++------
src/main/resources/mapper/modules/ContractHoldOrderEntityMapper.xml | 17 +
10 files changed, 576 insertions(+), 122 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/trademanage/controller/TradeManageController.java b/src/main/java/com/xcong/excoin/modules/trademanage/controller/TradeManageController.java
index 77db625..8ab6521 100644
--- a/src/main/java/com/xcong/excoin/modules/trademanage/controller/TradeManageController.java
+++ b/src/main/java/com/xcong/excoin/modules/trademanage/controller/TradeManageController.java
@@ -35,6 +35,14 @@
Map<String, Object> data = getDataTable(tradeManageService.findContractHoldOrderListInPage(contractHoldOrderEntity, request));
return new FebsResponse().success().data(data);
}
+ /**
+ * 当前持仓---列表alone
+ */
+ @GetMapping("contractHoldOrderAlone")
+ public FebsResponse contractHoldOrderAlone(ContractHoldOrderEntity contractHoldOrderEntity, QueryRequest request) {
+ Map<String, Object> data = getDataTable(tradeManageService.findContractHoldOrderAloneInPage(contractHoldOrderEntity, request));
+ return new FebsResponse().success().data(data);
+ }
/**
* 账户信息---列表
@@ -80,6 +88,14 @@
Map<String, Object> data = getDataTable(tradeManageService.findMemberHistoryOrderAllInfoInPage(contractOrderEntity, request));
return new FebsResponse().success().data(data);
}
+ /**
+ * 历史委托明细---alone
+ */
+ @GetMapping("historyOrderInfoAlone")
+ public FebsResponse historyOrderInfoAlone(ContractOrderEntity contractOrderEntity, QueryRequest request) {
+ Map<String, Object> data = getDataTable(tradeManageService.findHistoryOrderInfoAloneInfoInPage(contractOrderEntity, request));
+ return new FebsResponse().success().data(data);
+ }
}
diff --git a/src/main/java/com/xcong/excoin/modules/trademanage/controller/ViewController.java b/src/main/java/com/xcong/excoin/modules/trademanage/controller/ViewController.java
index 88a037f..e08dee9 100644
--- a/src/main/java/com/xcong/excoin/modules/trademanage/controller/ViewController.java
+++ b/src/main/java/com/xcong/excoin/modules/trademanage/controller/ViewController.java
@@ -1,77 +1,96 @@
-package com.xcong.excoin.modules.trademanage.controller;
-
-import com.xcong.excoin.common.entity.FebsConstant;
-import com.xcong.excoin.common.utils.FebsUtil;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-/**
- * @author wzy
- * @date 2020-06-10
- **/
-@Controller("tradeManageView")
-@RequestMapping(FebsConstant.VIEW_PREFIX + "modules/trademanage")
-public class ViewController {
-
- /**
- * 当前持仓
- */
- @GetMapping("contractHoldOrder")
- @RequiresPermissions("contractHoldOrder:view")
- public String contractHoldOrder() {
- return FebsUtil.view("modules/trademanage/contractHoldOrder");
- }
-
- /**
- * 账户信息
- * @return
- */
- @GetMapping("accountInfo")
- @RequiresPermissions("accountInfo:view")
- public String accountInfo() {
- return FebsUtil.view("modules/trademanage/accountInfo");
- }
-
- /**
- * 返佣明细
- * @return
- */
- @GetMapping("agentReturnInfo")
- @RequiresPermissions("agentReturnInfo:view")
- public String agentReturnInfo() {
- return FebsUtil.view("modules/trademanage/agentReturnInfo");
- }
-
- /**
- * 返佣总明细
- * @return
- */
- @GetMapping("agentReturnInfos")
- @RequiresPermissions("agentReturnInfos:view")
- public String agentReturnInfos() {
- return FebsUtil.view("modules/trademanage/agentReturnInfos");
- }
-
- /**
- * 历史委托明细
- * @return
- */
- @GetMapping("historyOrder")
- @RequiresPermissions("historyOrder:view")
- public String historyOrder() {
- return FebsUtil.view("modules/trademanage/historyOrder");
- }
-
- /**
- * 全部历史委托明细
- * @return
- */
- @GetMapping("historyOrderAll")
- @RequiresPermissions("historyOrderAll:view")
- public String historyOrderAll() {
- return FebsUtil.view("modules/trademanage/historyOrderAll");
- }
-
-}
+package com.xcong.excoin.modules.trademanage.controller;
+
+import com.xcong.excoin.common.entity.FebsConstant;
+import com.xcong.excoin.common.utils.FebsUtil;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @author wzy
+ * @date 2020-06-10
+ **/
+@Controller("tradeManageView")
+@RequestMapping(FebsConstant.VIEW_PREFIX + "modules/trademanage")
+public class ViewController {
+
+ /**
+ * 当前持仓
+ */
+ @GetMapping("contractHoldOrder")
+ @RequiresPermissions("contractHoldOrder:view")
+ public String contractHoldOrder() {
+ return FebsUtil.view("modules/trademanage/contractHoldOrder");
+ }
+
+ /**
+ * 当前持仓---alone
+ */
+ @GetMapping("contractHoldOrderAlone")
+ @RequiresPermissions("contractHoldOrderAlone:view")
+ public String contractHoldOrderAlone() {
+ return FebsUtil.view("modules/trademanage/contractHoldOrderAlone");
+ }
+
+ /**
+ * 账户信息
+ * @return
+ */
+ @GetMapping("accountInfo")
+ @RequiresPermissions("accountInfo:view")
+ public String accountInfo() {
+ return FebsUtil.view("modules/trademanage/accountInfo");
+ }
+
+ /**
+ * 返佣明细
+ * @return
+ */
+ @GetMapping("agentReturnInfo")
+ @RequiresPermissions("agentReturnInfo:view")
+ public String agentReturnInfo() {
+ return FebsUtil.view("modules/trademanage/agentReturnInfo");
+ }
+
+ /**
+ * 返佣总明细
+ * @return
+ */
+ @GetMapping("agentReturnInfos")
+ @RequiresPermissions("agentReturnInfos:view")
+ public String agentReturnInfos() {
+ return FebsUtil.view("modules/trademanage/agentReturnInfos");
+ }
+
+ /**
+ * 历史委托明细
+ * @return
+ */
+ @GetMapping("historyOrder")
+ @RequiresPermissions("historyOrder:view")
+ public String historyOrder() {
+ return FebsUtil.view("modules/trademanage/historyOrder");
+ }
+
+ /**
+ * 历史委托明细---alone
+ * @return
+ */
+ @GetMapping("historyOrderAlone")
+ @RequiresPermissions("historyOrderAlone:view")
+ public String historyOrderAlone() {
+ return FebsUtil.view("modules/trademanage/historyOrderAlone");
+ }
+
+ /**
+ * 全部历史委托明细
+ * @return
+ */
+ @GetMapping("historyOrderAll")
+ @RequiresPermissions("historyOrderAll:view")
+ public String historyOrderAll() {
+ return FebsUtil.view("modules/trademanage/historyOrderAll");
+ }
+
+}
diff --git a/src/main/java/com/xcong/excoin/modules/trademanage/mapper/ContractHoldOrderEntityMapper.java b/src/main/java/com/xcong/excoin/modules/trademanage/mapper/ContractHoldOrderEntityMapper.java
index 1c94218..b27e3cd 100644
--- a/src/main/java/com/xcong/excoin/modules/trademanage/mapper/ContractHoldOrderEntityMapper.java
+++ b/src/main/java/com/xcong/excoin/modules/trademanage/mapper/ContractHoldOrderEntityMapper.java
@@ -1,14 +1,17 @@
-package com.xcong.excoin.modules.trademanage.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.trademanage.entity.ContractHoldOrderEntity;
-
-public interface ContractHoldOrderEntityMapper extends BaseMapper<ContractHoldOrderEntity> {
-
- IPage<ContractHoldOrderEntity> selectContractHoldOrderListInPage(Page<ContractHoldOrderEntity> page,
- @Param("record") ContractHoldOrderEntity contractHoldOrderEntity);
-
-}
+package com.xcong.excoin.modules.trademanage.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.trademanage.entity.ContractHoldOrderEntity;
+
+public interface ContractHoldOrderEntityMapper extends BaseMapper<ContractHoldOrderEntity> {
+
+ IPage<ContractHoldOrderEntity> selectContractHoldOrderListInPage(Page<ContractHoldOrderEntity> page,
+ @Param("record") ContractHoldOrderEntity contractHoldOrderEntity);
+
+ IPage<ContractHoldOrderEntity> findContractHoldOrderAloneInPage(Page<ContractHoldOrderEntity> page,
+ @Param("record") ContractHoldOrderEntity contractHoldOrderEntity);
+
+}
diff --git a/src/main/java/com/xcong/excoin/modules/trademanage/mapper/ContractOrderMapper.java b/src/main/java/com/xcong/excoin/modules/trademanage/mapper/ContractOrderMapper.java
index 2a46836..e447827 100644
--- a/src/main/java/com/xcong/excoin/modules/trademanage/mapper/ContractOrderMapper.java
+++ b/src/main/java/com/xcong/excoin/modules/trademanage/mapper/ContractOrderMapper.java
@@ -15,4 +15,7 @@
IPage<ContractOrderEntity> findMemberHistoryOrderInfoAllInPage(Page<ContractOrderEntity> page,
@Param("record") ContractOrderEntity contractOrderEntity);
+ IPage<ContractOrderEntity> findHistoryOrderInfoAloneInfoInPage(Page<ContractOrderEntity> page,
+ @Param("record") ContractOrderEntity contractOrderEntity);
+
}
diff --git a/src/main/java/com/xcong/excoin/modules/trademanage/service/TradeManageService.java b/src/main/java/com/xcong/excoin/modules/trademanage/service/TradeManageService.java
index 7785744..a9bfd32 100644
--- a/src/main/java/com/xcong/excoin/modules/trademanage/service/TradeManageService.java
+++ b/src/main/java/com/xcong/excoin/modules/trademanage/service/TradeManageService.java
@@ -1,31 +1,35 @@
-package com.xcong.excoin.modules.trademanage.service;
-
-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.member.entity.MemberAccountMoneyChangeEntity;
-import com.xcong.excoin.modules.member.entity.MemberEntity;
-import com.xcong.excoin.modules.trademanage.entity.AgentReturnEntity;
-import com.xcong.excoin.modules.trademanage.entity.ContractHoldOrderEntity;
-import com.xcong.excoin.modules.trademanage.entity.ContractOrderEntity;
-import com.xcong.excoin.modules.trademanage.vo.MemberAccountInfoVo;
-
-/**
- * @author helius
- */
-public interface TradeManageService extends IService<ContractHoldOrderEntity> {
-
- IPage<ContractHoldOrderEntity> findContractHoldOrderListInPage(ContractHoldOrderEntity contractHoldOrderEntity, QueryRequest request);
-
- IPage<MemberAccountInfoVo> findMemberAccountInfoListInPage(MemberEntity memberEntity, QueryRequest request);
-
- IPage<MemberAccountMoneyChangeEntity> findMemberAgentReturnInfoInPage(MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity,
- QueryRequest request);
-
- IPage<ContractOrderEntity> findMemberHistoryOrderInfoInPage(ContractOrderEntity contractOrderEntity, QueryRequest request);
-
- IPage<AgentReturnEntity> findMemberAgentReturnInfosInPage(AgentReturnEntity agentReturnEntity, QueryRequest request);
-
- IPage<ContractOrderEntity> findMemberHistoryOrderAllInfoInPage(ContractOrderEntity contractOrderEntity, QueryRequest request);
-
-}
+package com.xcong.excoin.modules.trademanage.service;
+
+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.member.entity.MemberAccountMoneyChangeEntity;
+import com.xcong.excoin.modules.member.entity.MemberEntity;
+import com.xcong.excoin.modules.trademanage.entity.AgentReturnEntity;
+import com.xcong.excoin.modules.trademanage.entity.ContractHoldOrderEntity;
+import com.xcong.excoin.modules.trademanage.entity.ContractOrderEntity;
+import com.xcong.excoin.modules.trademanage.vo.MemberAccountInfoVo;
+
+/**
+ * @author helius
+ */
+public interface TradeManageService extends IService<ContractHoldOrderEntity> {
+
+ IPage<ContractHoldOrderEntity> findContractHoldOrderListInPage(ContractHoldOrderEntity contractHoldOrderEntity, QueryRequest request);
+
+ IPage<MemberAccountInfoVo> findMemberAccountInfoListInPage(MemberEntity memberEntity, QueryRequest request);
+
+ IPage<MemberAccountMoneyChangeEntity> findMemberAgentReturnInfoInPage(MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity,
+ QueryRequest request);
+
+ IPage<ContractOrderEntity> findMemberHistoryOrderInfoInPage(ContractOrderEntity contractOrderEntity, QueryRequest request);
+
+ IPage<AgentReturnEntity> findMemberAgentReturnInfosInPage(AgentReturnEntity agentReturnEntity, QueryRequest request);
+
+ IPage<ContractOrderEntity> findMemberHistoryOrderAllInfoInPage(ContractOrderEntity contractOrderEntity, QueryRequest request);
+
+ IPage<ContractHoldOrderEntity> findContractHoldOrderAloneInPage(ContractHoldOrderEntity contractHoldOrderEntity, QueryRequest request);
+
+ IPage<ContractOrderEntity> findHistoryOrderInfoAloneInfoInPage(ContractOrderEntity contractOrderEntity, QueryRequest request);
+
+}
diff --git a/src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java b/src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java
index 1561835..00ed1a6 100644
--- a/src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java
@@ -152,4 +152,53 @@
return findMemberAccountInfoListInPage;
}
+ @Override
+ public IPage<ContractHoldOrderEntity> findContractHoldOrderAloneInPage(
+ ContractHoldOrderEntity contractHoldOrderEntity, QueryRequest request) {
+ Page<ContractHoldOrderEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<ContractHoldOrderEntity> findMemberAccountInfoListInPage = contractHoldOrderEntityMapper.findContractHoldOrderAloneInPage(page, contractHoldOrderEntity);
+ List<ContractHoldOrderEntity> records = findMemberAccountInfoListInPage.getRecords();
+
+ if (records != null) {
+ for (ContractHoldOrderEntity holdOrderEntity : records) {
+ MemberEntity selectById = memberMapper.selectById(holdOrderEntity.getMemberId());
+ // 获取最新价
+ BigDecimal newPrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(holdOrderEntity.getSymbol())));
+ BigDecimal lotNumber = holdOrderEntity.getSymbolSku();
+ // 盈亏
+ BigDecimal rewardRatio = BigDecimal.ZERO;
+ // 开多
+ if (ContractHoldOrderEntity.OPENING_TYPE_MORE == holdOrderEntity.getOpeningType()) {
+ // (最新价-开仓价)*规格*张数
+ rewardRatio = newPrice.subtract(holdOrderEntity.getOpeningPrice()).multiply(lotNumber).multiply(new BigDecimal(holdOrderEntity.getSymbolCnt()));
+ // 开空
+ } else {
+ // (开仓价-最新价)*规格*张数
+ rewardRatio = holdOrderEntity.getOpeningPrice().subtract(newPrice).multiply(lotNumber).multiply(new BigDecimal(holdOrderEntity.getSymbolCnt()));
+ }
+
+ if (selectById.getIsProfit() == MemberEntity.IS_PROFIT_Y) {
+ String selectTradeSetting = memberMapper.selectTradeSetting();
+ BigDecimal profitParam=new BigDecimal(selectTradeSetting);
+ if (rewardRatio.compareTo(BigDecimal.ZERO) > -1) {
+ rewardRatio = rewardRatio.multiply(BigDecimal.ONE.subtract(profitParam));
+ } else {
+ rewardRatio = rewardRatio.multiply(BigDecimal.ONE.add(profitParam));
+ }
+ }
+
+ holdOrderEntity.setRewardRatio(rewardRatio);
+ }
+ }
+ return findMemberAccountInfoListInPage;
+ }
+
+ @Override
+ public IPage<ContractOrderEntity> findHistoryOrderInfoAloneInfoInPage(ContractOrderEntity contractOrderEntity,
+ QueryRequest request) {
+ Page<ContractOrderEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<ContractOrderEntity> findMemberAccountInfoListInPage = contractHoldOrderMapper.findHistoryOrderInfoAloneInfoInPage(page, contractOrderEntity);
+ return findMemberAccountInfoListInPage;
+ }
+
}
diff --git a/src/main/resources/mapper/modules/ContractHoldOrderEntityMapper.xml b/src/main/resources/mapper/modules/ContractHoldOrderEntityMapper.xml
index c3cdf16..64904a5 100644
--- a/src/main/resources/mapper/modules/ContractHoldOrderEntityMapper.xml
+++ b/src/main/resources/mapper/modules/ContractHoldOrderEntityMapper.xml
@@ -25,5 +25,22 @@
</where>
ORDER BY s.create_time DESC
</select>
+
+ <select id="findContractHoldOrderAloneInPage" resultType="com.xcong.excoin.modules.trademanage.entity.ContractHoldOrderEntity">
+ SELECT
+ *
+ FROM
+ contract_hold_order s
+ LEFT JOIN member m ON m.id = s.member_id
+ <where>
+ FIND_IN_SET('22015141', m.referer_ids)
+ <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>
+ </where>
+ ORDER BY s.create_time DESC
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/modules/ContractOrderMapper.xml b/src/main/resources/mapper/modules/ContractOrderMapper.xml
index cb2c8bb..c3137f7 100644
--- a/src/main/resources/mapper/modules/ContractOrderMapper.xml
+++ b/src/main/resources/mapper/modules/ContractOrderMapper.xml
@@ -48,5 +48,26 @@
</where>
order by s.opening_time desc
</select>
+
+ <select id="findMemberHistoryOrderInfoAllInPage" resultType="com.xcong.excoin.modules.trademanage.entity.ContractOrderEntity">
+ SELECT
+ *
+ FROM
+ contract_order s
+ LEFT JOIN member m ON m.id = s.member_id
+ <where>
+ s.closing_type in (2,3,4,5,6,7,8,9)
+ and FIND_IN_SET('22015141', m.referer_ids)
+ <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.closingType!=null and record.closingType!=''">
+ and s.closing_type = #{record.closingType}
+ </if>
+ </if>
+ </where>
+ order by s.opening_time desc
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/modules/trademanage/contractHoldOrderAlone.html b/src/main/resources/templates/febs/views/modules/trademanage/contractHoldOrderAlone.html
new file mode 100644
index 0000000..5c9c56b
--- /dev/null
+++ b/src/main/resources/templates/febs/views/modules/trademanage/contractHoldOrderAlone.html
@@ -0,0 +1,126 @@
+<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>
+ </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>
+<!-- 表格操作栏 end -->
+<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,
+ treeSelect = layui.treeSelect,
+ dropdown = layui.dropdown,
+ $view = $('#febs-user'),
+ $query = $view.find('#query'),
+ $reset = $view.find('#reset'),
+ $searchForm = $view.find('form'),
+ sortObject = {field: 'createTime', type: null},
+ tableIns;
+
+ form.render();
+
+ // 表格初始化
+ initTable();
+
+ // 查询按钮
+ $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';
+ tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});
+ });
+
+ function initTable() {
+ tableIns = febs.table.init({
+ elem: $view.find('table'),
+ id: 'userTable',
+ url: ctx + 'tradeManage/contractHoldOrderAlone',
+ totalRow: true,
+ cols: [[
+ {field: 'phone', title: '手机号', minWidth: 100,align:'left'},
+ {field: 'forceClosingPrice', title: '预估强平价', minWidth: 120,align:'center'},
+ {field: 'openingType', title: '开仓类型',
+ templet: function (d) {
+ if (d.openingType === 1) {
+ return '<span style="color:green;">开多</span>'
+ }else {
+ return '<span style="color:red;">开空</span>'
+ }
+ }, minWidth: 100,align:'center'},
+ {field: 'tradeType', title: '交易类型',
+ templet: function (d) {
+ if (d.tradeType === 1) {
+ return '<span style="color:green;">市价</span>'
+ }else {
+ return '<span style="color:red;">限价</span>'
+ }
+ }, minWidth: 100,align:'center'},
+ {field: 'symbol', title: '币种', minWidth: 100,align:'center'},
+ {field: 'symbolCnt', title: '手数', minWidth: 80,align:'center'},
+ {field: 'rewardRatio', title: '实时盈亏',
+ templet: function (d) {
+ if (d.rewardRatio > 0) {
+ return '<span style="color:green;">' + d.rewardRatio + '</span>'
+ }else {
+ return '<span style="color:red;">' + d.rewardRatio + '</span>'
+ }
+ },minWidth: 120,align:'center',totalRow: true},
+ {field: 'openingPrice', title: '开仓价', minWidth: 100,align:'center'},
+ {field: 'openingFeeAmount', 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: 'stopLossPrice', title: '止损价', minWidth: 120,align:'center'},
+ {field: 'stopProfitPrice', title: '止盈价', minWidth: 120,align:'center'},
+ {field: 'inviteId', title: '邀请码UID', minWidth: 120,align:'center'},
+ {field: 'orderNo', title: '订单编号', minWidth: 200,align:'center'},
+ {field: 'email', title: '邮箱', minWidth: 200,align:'left'},
+ ]]
+ });
+ }
+
+ // 获取查询参数
+ function getQueryParams() {
+ return {
+ account: $searchForm.find('input[name="account"]').val().trim(),
+ };
+ }
+
+ })
+</script>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/modules/trademanage/historyOrderAlone.html b/src/main/resources/templates/febs/views/modules/trademanage/historyOrderAlone.html
new file mode 100644
index 0000000..3480cc7
--- /dev/null
+++ b/src/main/resources/templates/febs/views/modules/trademanage/historyOrderAlone.html
@@ -0,0 +1,196 @@
+<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="closingType">
+ <option value="0">请选择</option>
+ <option value="2">平多</option>
+ <option value="3">平空</option>
+ <option value="4">爆仓平多</option>
+ <option value="5">爆仓平空</option>
+ <option value="6">止盈平多</option>
+ <option value="7">止盈平空</option>
+ <option value="8">止损平多</option>
+ <option value="9">止损平空</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>
+<!-- 表格操作栏 end -->
+<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,
+ treeSelect = layui.treeSelect,
+ dropdown = layui.dropdown,
+ $view = $('#febs-user'),
+ $query = $view.find('#query'),
+ $reset = $view.find('#reset'),
+ $searchForm = $view.find('form'),
+ sortObject = {field: 'createTime', type: null},
+ tableIns;
+
+ form.render();
+
+ // 表格初始化
+ initTable();
+
+ // 查询按钮
+ $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 + 'tradeManage/historyOrderInfoAlone',
+ totalRow: true,
+ cols: [[
+ {field: 'phone', title: '手机号', minWidth: 120,align:'left',totalRowText: '合计'},
+ {field: 'inviteId', title: '邀请码UID', minWidth: 120,align:'center'},
+ {field: 'tradeType', title: '交易类型',
+ templet: function (d) {
+ if (d.tradeType === 1) {
+ return '<span style="color:green;">市价</span>'
+ }else {
+ return '<span style="color:red;">限价</span>'
+ }
+ }, minWidth: 100,align:'center'},
+
+
+ {field: 'symbol', title: '币种', minWidth: 120,align:'center'},
+ {field: 'symbolCnt', title: '手数', minWidth: 80,align:'center'},
+ {field: 'orderType', title: '订单类型',
+ templet: function (d) {
+ if (d.orderType === 1) {
+ return '<span style="color:green;">开多</span>'
+ }else if (d.orderType === 2) {
+ return '<span style="color:red;">开空</span>'
+ }else if (d.orderType === 3) {
+ return '<span style="color:green;">平多</span>'
+ }else if (d.orderType === 4) {
+ return '<span style="color:red;">平空</span>'
+ }else{
+ return ''
+ }
+ }, minWidth: 100,align:'center'},
+ {field: 'openingPrice', title: '开仓价', minWidth: 100,align:'center'},
+ {field: 'openingTime', title: '开仓时间', minWidth: 200,align:'center'},
+ {field: 'closingType', title: '平仓类型',
+ templet: function (d) {
+ if (d.closingType === 0) {
+ return '<span style="color:blue;">开仓</span>'
+ }else if (d.closingType === 2) {
+ return '<span style="color:green;">平多</span>'
+ }else if (d.closingType === 3) {
+ return '<span style="color:red;">平空</span>'
+ }else if (d.closingType === 4) {
+ return '<span style="color:red;">爆仓平多</span>'
+ }else if (d.closingType === 5) {
+ return '<span style="color:red;">爆仓平空</span>'
+ }else if (d.closingType === 6) {
+ return '<span style="color:green;">止盈平多</span>'
+ }else if (d.closingType === 7) {
+ return '<span style="color:green;">止盈平空</span>'
+ }else if (d.closingType === 8) {
+ return '<span style="color:red;">止损平多</span>'
+ }else if (d.closingType === 9) {
+ return '<span style="color:red;">止损平空</span>'
+ }else{
+ return ''
+ }
+ }, minWidth: 120,align:'center'},
+ {field: 'closingPrice', title: '平仓价', minWidth: 100,align:'center'},
+ {field: 'closingTime', title: '平仓时间', minWidth: 200,align:'center'},
+ {field: 'rewardAmount', title: '盈亏金额',
+ templet: function (d) {
+ if (d.rewardAmount > 0) {
+ return '<span style="color:green;">' + d.rewardAmount + '</span>'
+ }
+ if (d.rewardAmount < 0) {
+ return '<span style="color:red;">' + d.rewardAmount + '</span>'
+ }
+ if (d.rewardAmount == 0 || d.rewardAmount == "" || d.rewardAmount == null) {
+ return '<span></span>'
+ }
+ },minWidth: 120,align:'center',totalRow: true},
+ {field: 'prePaymentAmount', title: '预付款金额', minWidth: 120,align:'center'},
+ {field: 'forceClosingPrice', title: '预估强平价', minWidth: 120,align:'center'},
+ {field: 'bondAmount', title: '保证金', minWidth: 120,align:'center'},
+ {field: 'stopLossPrice', title: '止损价', minWidth: 120,align:'center'},
+ {field: 'stopProfitPrice', title: '止盈价', minWidth: 120,align:'center'},
+ {field: 'openingFeeAmount', title: '开仓手续费', minWidth: 120,align:'center',totalRow: true},
+ {field: 'closingFeeAmount', title: '平仓手续费', minWidth: 100,align:'center',totalRow: true},
+ {field: 'holdAmount', title: '持仓费', minWidth: 120,align:'center',totalRow: true},
+ {field: 'rewardRatio', title: '盈亏比例', minWidth: 120,align:'center'},
+ {field: 'entrustOpeningPrice', title: '委托开仓价', minWidth: 150,align:'center'},
+ {field: 'entrustTime', title: '委托时间', minWidth: 200,align:'center'},
+ {field: 'orderStatus', title: '订单状态',
+ templet: function (d) {
+ if (d.orderStatus === 1) {
+ return '<span style="color:green;">成交</span>'
+ }else if (d.orderStatus === 2) {
+ return '<span style="color:red;">撤单</span>'
+ }else{
+ return ''
+ }
+ }, minWidth: 120,align:'center'},
+ {field: 'orderNo', title: '订单编号', minWidth: 200,align:'center'},
+ {field: 'leverRatio', title: '杠杆倍率', minWidth: 120,align:'center'},
+ {field: 'email', title: '邮箱', minWidth: 200,align:'left'},
+ ]]
+ });
+ }
+
+ // 获取查询参数
+ function getQueryParams() {
+ return {
+ account: $searchForm.find('input[name="account"]').val().trim(),
+ closingType: $searchForm.find("select[name='closingType']").val(),
+ };
+ }
+
+ })
+</script>
\ No newline at end of file
--
Gitblit v1.9.1