From 2f8f4085cd854cdfc7d3a692c3f77138584141e1 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 16 Jun 2021 10:33:41 +0800
Subject: [PATCH] 20210615 期货交易记录
---
src/main/java/com/xcong/excoin/modules/trademanage/service/impl/OrderCoinsDealServiceImpl.java | 7 +
src/main/resources/templates/febs/views/modules/trademanage/gbzOrderList.html | 100 +++++++++++++++++++++++++
src/main/java/com/xcong/excoin/modules/trademanage/mapper/OrderCoinDealMapper.java | 3
src/main/resources/mapper/modules/OrderCoinDealMapper.xml | 22 +++++
src/main/java/com/xcong/excoin/modules/trademanage/controller/OrderCoinDealController.java | 9 ++
src/main/java/com/xcong/excoin/modules/trademanage/entity/GbzOrderEntity.java | 62 +++++++++++++++
src/main/java/com/xcong/excoin/modules/trademanage/controller/ViewController.java | 10 ++
src/main/java/com/xcong/excoin/modules/trademanage/service/OrderCoinDealService.java | 7 -
8 files changed, 216 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/trademanage/controller/OrderCoinDealController.java b/src/main/java/com/xcong/excoin/modules/trademanage/controller/OrderCoinDealController.java
index e00b33d..c7ef0c4 100644
--- a/src/main/java/com/xcong/excoin/modules/trademanage/controller/OrderCoinDealController.java
+++ b/src/main/java/com/xcong/excoin/modules/trademanage/controller/OrderCoinDealController.java
@@ -7,6 +7,7 @@
import com.xcong.excoin.modules.systemSetting.entity.PlatformTradeSettingEntity;
import com.xcong.excoin.modules.trademanage.dto.BzzNewPriceDto;
import com.xcong.excoin.modules.trademanage.entity.ContractHoldOrderEntity;
+import com.xcong.excoin.modules.trademanage.entity.GbzOrderEntity;
import com.xcong.excoin.modules.trademanage.entity.OrderCoinsDealEntity;
import com.xcong.excoin.modules.trademanage.service.OrderCoinDealService;
import lombok.RequiredArgsConstructor;
@@ -36,6 +37,14 @@
return new FebsResponse().success().data(data);
}
+
+
+ @GetMapping("/gbzOrderList")
+ public FebsResponse gbzOrderList(GbzOrderEntity gbzOrderEntity, QueryRequest request) {
+ Map<String, Object> data = getDataTable(orderCoinDealService.gbzOrderEntity(gbzOrderEntity, request));
+ return new FebsResponse().success().data(data);
+ }
+
/**
* BZZ最新价
*/
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 a67fd23..4760d09 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
@@ -25,6 +25,16 @@
@Resource
private RedisUtils redisUtils;
+
+ /**
+ * 期貨记录
+ */
+ @GetMapping("gbzOrderList")
+ @RequiresPermissions("gbzOrderList:view")
+ public String gbzOrderList() {
+ return FebsUtil.view("modules/trademanage/gbzOrderList");
+ }
+
/**
* BZZ最新价
*/
diff --git a/src/main/java/com/xcong/excoin/modules/trademanage/entity/GbzOrderEntity.java b/src/main/java/com/xcong/excoin/modules/trademanage/entity/GbzOrderEntity.java
new file mode 100644
index 0000000..097331d
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/trademanage/entity/GbzOrderEntity.java
@@ -0,0 +1,62 @@
+package com.xcong.excoin.modules.trademanage.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;
+
+//gbz订单表
+@Data
+@TableName("gbz_order")
+public class GbzOrderEntity extends BaseEntity {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ //会员ID
+ private Long memberId;
+
+ //金额
+ private BigDecimal amount;
+
+ //数量
+ private Integer cnt;
+
+ //币种
+ private String symbol;
+
+ //单价
+ private BigDecimal price;
+
+ //状态
+ private Integer status;
+
+ /**
+ * 手机号(包含国际手机号)
+ */
+ @TableField(exist = false)
+ private String phone;
+ /**
+ * 邮箱
+ */
+ @TableField(exist = false)
+ private String email;
+ @TableField(exist = false)
+ private String account;
+ /**
+ * 邀请码
+ */
+ @TableField(exist = false)
+ private String inviteId;
+ /**
+ * 姓名
+ */
+ @TableField(exist = false)
+ private String realName;
+
+
+}
diff --git a/src/main/java/com/xcong/excoin/modules/trademanage/mapper/OrderCoinDealMapper.java b/src/main/java/com/xcong/excoin/modules/trademanage/mapper/OrderCoinDealMapper.java
index b92e088..6b2f50a 100644
--- a/src/main/java/com/xcong/excoin/modules/trademanage/mapper/OrderCoinDealMapper.java
+++ b/src/main/java/com/xcong/excoin/modules/trademanage/mapper/OrderCoinDealMapper.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.xcong.excoin.modules.trademanage.entity.ContractHoldOrderEntity;
+import com.xcong.excoin.modules.trademanage.entity.GbzOrderEntity;
import com.xcong.excoin.modules.trademanage.entity.OrderCoinsDealEntity;
import org.apache.ibatis.annotations.Param;
@@ -12,4 +13,6 @@
IPage<OrderCoinsDealEntity> selectOrderCoinsDealListInPage(Page<OrderCoinsDealEntity> page,
@Param("record") OrderCoinsDealEntity OrderCoinsDealEntity);
+ IPage<GbzOrderEntity> selectGbzOrderEntitysInPage(Page<GbzOrderEntity> page,
+ @Param("record")GbzOrderEntity gbzOrderEntity);
}
diff --git a/src/main/java/com/xcong/excoin/modules/trademanage/service/OrderCoinDealService.java b/src/main/java/com/xcong/excoin/modules/trademanage/service/OrderCoinDealService.java
index bcadff0..a67aa3d 100644
--- a/src/main/java/com/xcong/excoin/modules/trademanage/service/OrderCoinDealService.java
+++ b/src/main/java/com/xcong/excoin/modules/trademanage/service/OrderCoinDealService.java
@@ -7,10 +7,7 @@
import com.xcong.excoin.modules.member.entity.MemberAccountMoneyChangeEntity;
import com.xcong.excoin.modules.member.entity.MemberEntity;
import com.xcong.excoin.modules.trademanage.dto.BzzNewPriceDto;
-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.entity.OrderCoinsDealEntity;
+import com.xcong.excoin.modules.trademanage.entity.*;
import com.xcong.excoin.modules.trademanage.vo.BzzNewPriceVo;
import com.xcong.excoin.modules.trademanage.vo.MemberAccountInfoVo;
@@ -24,4 +21,6 @@
IPage<BzzNewPriceVo> bzzNewPrice(QueryRequest request);
FebsResponse bzzNewPriceUpdate(BzzNewPriceDto bzzNewPriceDto);
+
+ IPage<GbzOrderEntity> gbzOrderEntity(GbzOrderEntity gbzOrderEntity, QueryRequest request);
}
diff --git a/src/main/java/com/xcong/excoin/modules/trademanage/service/impl/OrderCoinsDealServiceImpl.java b/src/main/java/com/xcong/excoin/modules/trademanage/service/impl/OrderCoinsDealServiceImpl.java
index 859d0ff..8498a1d 100644
--- a/src/main/java/com/xcong/excoin/modules/trademanage/service/impl/OrderCoinsDealServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/trademanage/service/impl/OrderCoinsDealServiceImpl.java
@@ -76,4 +76,11 @@
return new FebsResponse().fail().message("设置失败");
}
}
+
+ @Override
+ public IPage<GbzOrderEntity> gbzOrderEntity(GbzOrderEntity gbzOrderEntity, QueryRequest request) {
+ Page<GbzOrderEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<GbzOrderEntity> gbzOrderEntitys = orderCoinDealMapper.selectGbzOrderEntitysInPage(page, gbzOrderEntity);
+ return gbzOrderEntitys;
+ }
}
diff --git a/src/main/resources/mapper/modules/OrderCoinDealMapper.xml b/src/main/resources/mapper/modules/OrderCoinDealMapper.xml
index 98982d7..f0a4cd8 100644
--- a/src/main/resources/mapper/modules/OrderCoinDealMapper.xml
+++ b/src/main/resources/mapper/modules/OrderCoinDealMapper.xml
@@ -19,5 +19,27 @@
ORDER BY s.create_time DESC
</select>
+ <select id="selectGbzOrderEntitysInPage" resultType="com.xcong.excoin.modules.trademanage.entity.GbzOrderEntity">
+ SELECT
+ *,
+ CONCAT(first_name, second_name) realName
+ FROM
+ gbz_order s
+ LEFT JOIN member m ON m.id = s.member_id
+ LEFT JOIN member_authentication a ON a.member_id = s.member_id
+ <where>
+ <if test="record != null" >
+ <if test="record.account!=null and record.account!=''">
+ and (m.phone like concat("%",#{record.account},"%") or m.email like concat("%",#{record.account},"%") or m.invite_id=#{record.account})
+ </if>
+
+ <if test="record.status!=null and record.status!=''">
+ and s.status = #{record.status}
+ </if>
+ </if>
+ </where>
+ ORDER BY s.create_time DESC
+ </select>
+
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/modules/trademanage/gbzOrderList.html b/src/main/resources/templates/febs/views/modules/trademanage/gbzOrderList.html
new file mode 100644
index 0000000..d6b8ef8
--- /dev/null
+++ b/src/main/resources/templates/febs/views/modules/trademanage/gbzOrderList.html
@@ -0,0 +1,100 @@
+<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(['jquery', 'form', 'table', 'febs'], function () {
+ var $ = layui.jquery,
+ 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();
+
+ // 查询按钮
+ $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 + 'orderCoin/gbzOrderList',
+ totalRow: true,
+ cols: [[
+ {field: 'phone', title: '手机号', minWidth: 100,align:'left',totalRowText: '合计'},
+ {field: 'realName', title: '姓名', minWidth: 120,align:'left'},
+ {field: 'inviteId', title: '邀请码', minWidth: 120,align:'center'},
+ {field: 'status', title: '状态',
+ templet: function (d) {
+ if (d.status === 1) {
+ return '<span style="color:green;">成功</span>'
+ }else {
+ return ''
+ }
+ }, minWidth: 100,align:'center'},
+ {field: 'symbol', title: '币种', minWidth: 100,align:'center'},
+ {field: 'price', title: '单价', minWidth: 80,align:'center'},
+ {field: 'cnt', title: '数量', minWidth: 80,align:'center'},
+ {field: 'amount', title: '金额', minWidth: 120,align:'center'},
+ {field: 'createTime', title: '创建时间', minWidth: 100,align:'center'},
+ ]]
+ });
+ }
+
+ // 获取查询参数
+ function getQueryParams() {
+ return {
+ account: $searchForm.find('input[name="account"]').val().trim(),
+ };
+ }
+
+ })
+</script>
\ No newline at end of file
--
Gitblit v1.9.1