From e74838c27c1779c1fd056e40b1e9dad5ff1537d4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 20 Aug 2020 11:39:46 +0800
Subject: [PATCH] 20200820
---
src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java | 2
src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java | 10 ++
src/main/java/com/xcong/excoin/modules/member/mapper/MemberMapper.java | 6 +
src/main/resources/templates/febs/views/modules/member/memberDataInfoAllAloneTest.html | 1
src/main/java/com/xcong/excoin/modules/member/service/IMemberService.java | 2
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 45 +++++++++++
src/main/java/com/xcong/excoin/modules/documentary/controller/DocumentaryController.java | 1
src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java | 6 +
src/main/resources/templates/febs/views/modules/member/memberDataInfoListSearch.html | 124 +++++++++++++++++++++++++++++++
src/main/java/com/xcong/excoin/modules/member/vo/MemberDataInfoVo.java | 2
10 files changed, 197 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/documentary/controller/DocumentaryController.java b/src/main/java/com/xcong/excoin/modules/documentary/controller/DocumentaryController.java
index 621939d..0a2028b 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/controller/DocumentaryController.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/controller/DocumentaryController.java
@@ -19,7 +19,6 @@
import com.xcong.excoin.modules.documentary.dto.FollowTraderInfoDto;
import com.xcong.excoin.modules.documentary.entity.FollowTraderInfoEntity;
import com.xcong.excoin.modules.documentary.service.DocumentaryService;
-import com.xcong.excoin.modules.member.dto.MemberDetailConfirmDto;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
diff --git a/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java b/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
index 695610f..358a390 100644
--- a/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
+++ b/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
@@ -65,6 +65,12 @@
return new FebsResponse().success().data(data);
}
+ @GetMapping("memberDataInfoListSearchs")
+ public FebsResponse memberDataInfoListSearchs(MemberEntity member, QueryRequest request) {
+ Map<String, Object> data = getDataTable(memberService.memberDataInfoListSearchs(member, request));
+ return new FebsResponse().success().data(data);
+ }
+
@GetMapping("getListTest")
public FebsResponse getListTest(MemberEntity member, QueryRequest request) {
Map<String, Object> data = getDataTable(memberService.findMemberListTestInPage(member, request));
diff --git a/src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java b/src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java
index ebf2524..b75878d 100644
--- a/src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java
+++ b/src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java
@@ -45,6 +45,16 @@
public String agentInfo() {
return FebsUtil.view("modules/member/agentInfo");
}
+
+ /**
+ * 个人信息--上下级关系查询
+ * @return
+ */
+ @GetMapping("memberDataInfoListSearch")
+ @RequiresPermissions("memberDataInfoListSearch:view")
+ public String memberDataInfoListSearch() {
+ return FebsUtil.view("modules/member/memberDataInfoListSearch");
+ }
/**
* 个人信息
diff --git a/src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java b/src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java
index e3c9d5f..174bd4d 100644
--- a/src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java
@@ -143,7 +143,7 @@
/**
* 是否是交易员1是2否
*/
- @TableField(exist = false)
+ //@TableField(exist = false)
private Integer isTrader;
/**
diff --git a/src/main/java/com/xcong/excoin/modules/member/mapper/MemberMapper.java b/src/main/java/com/xcong/excoin/modules/member/mapper/MemberMapper.java
index 342762b..4c771c2 100644
--- a/src/main/java/com/xcong/excoin/modules/member/mapper/MemberMapper.java
+++ b/src/main/java/com/xcong/excoin/modules/member/mapper/MemberMapper.java
@@ -224,5 +224,11 @@
@Param("record")MemberEntity memberEntity);
String selectMemberInfoDetailByInviteId(@Param("inviteId")String inviteId);
+
+ List<MemberEntity> selectMemberDataInfoListSearchs(@Param("inviteId")String inviteId);
+
+ MemberEntity selectMemberByInviteId(@Param("inviteId")String string);
+
+ IPage<MemberEntity> selectDataInfoListSearchs(Page<MemberEntity> page, @Param("record")MemberEntity member);
}
diff --git a/src/main/java/com/xcong/excoin/modules/member/service/IMemberService.java b/src/main/java/com/xcong/excoin/modules/member/service/IMemberService.java
index 6e0adfe..d2c33b9 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/IMemberService.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/IMemberService.java
@@ -95,4 +95,6 @@
MemberInfoDetailVo selectMemberInfoDetailByInviteId(String inviteId);
+ IPage<MemberEntity> memberDataInfoListSearchs(MemberEntity member, QueryRequest request);
+
}
diff --git a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
index 6e8d090..09742ca 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
@@ -1,6 +1,7 @@
package com.xcong.excoin.modules.member.service.impl;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -1245,6 +1246,10 @@
String walletNum = memberMapper.selectBBZCForBasicRealTestAllDataAlone();
String walletCoinNum = memberMapper.selectHYZCForBasicRealTestAllDataAlone();
String agentNum = memberMapper.selectDLZCForBasicRealTestAllDataAlone();
+ double allCoin = 0 ;
+ allCoin = (walletNum == null ? 0 : Double.parseDouble(walletNum))
+ +(walletCoinNum == null ? 0 : Double.parseDouble(walletCoinNum))
+ +(agentNum == null ? 0 : Double.parseDouble(agentNum));
double platformProfitAndLoss = 0 ;
platformProfitAndLoss = platformProfitAndLoss + (totalAmountUsdtB == null ? 0 : Double.parseDouble(totalAmountUsdtB));
@@ -1269,6 +1274,7 @@
memberDataInfoVo.setWalletNum(walletNum == null ? "0" : walletNum);
memberDataInfoVo.setWalletCoinNum(walletCoinNum == null ? "0" : walletCoinNum);
memberDataInfoVo.setAgentNum(agentNum == null ? "0" : agentNum);
+ memberDataInfoVo.setAllCoin(allCoin);
}
selectMemberListInPage.setTotal(1);
return selectMemberListInPage;
@@ -1327,4 +1333,43 @@
return memberInfoDetailVo;
}
+
+ @Override
+ public IPage<MemberEntity> memberDataInfoListSearchs(MemberEntity member, QueryRequest request) {
+
+ Page<MemberEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<MemberEntity> selectMemberListInPage = this.baseMapper.selectDataInfoListSearchs(page, member);
+ List<MemberEntity> records = selectMemberListInPage.getRecords();
+ Set<MemberEntity> set = new HashSet<>();
+ if(CollUtil.isNotEmpty(records)) {
+ if(StrUtil.isNotBlank(member.getAccount())) {
+ MemberEntity memberEntity = records.get(0);
+ //当前查询下级关系
+ String inviteId = memberEntity.getInviteId();
+ List<MemberEntity> members = memberMapper.selectMemberDataInfoListSearchs(inviteId);
+ if(CollUtil.isNotEmpty(members)) {
+ for(MemberEntity semberEntity : members) {
+ set.add(semberEntity);
+ }
+ }
+ //当前查询上级关系
+ String refererIds = memberEntity.getRefererIds();
+ String[] strs = refererIds.split(",");
+ if(ObjectUtil.isNotEmpty(strs)) {
+ for(int i=0,len=strs.length;i<len;i++){
+ String string = strs[i].toString();
+ if(StrUtil.isNotEmpty(string)) {
+ MemberEntity mem = memberMapper.selectMemberByInviteId(string);
+ set.add(mem);
+ }
+ }
+ }
+ }
+ if(set.size() > 0) {
+ records.addAll(set);
+ }
+ }
+ return selectMemberListInPage;
+ }
+
}
diff --git a/src/main/java/com/xcong/excoin/modules/member/vo/MemberDataInfoVo.java b/src/main/java/com/xcong/excoin/modules/member/vo/MemberDataInfoVo.java
index 5d4a129..ec86e22 100644
--- a/src/main/java/com/xcong/excoin/modules/member/vo/MemberDataInfoVo.java
+++ b/src/main/java/com/xcong/excoin/modules/member/vo/MemberDataInfoVo.java
@@ -40,6 +40,8 @@
private String doingPrice;//持仓费
private String yingkui;
+
+ private double allCoin;
}
diff --git a/src/main/resources/templates/febs/views/modules/member/memberDataInfoAllAloneTest.html b/src/main/resources/templates/febs/views/modules/member/memberDataInfoAllAloneTest.html
index 745a35e..648772e 100644
--- a/src/main/resources/templates/febs/views/modules/member/memberDataInfoAllAloneTest.html
+++ b/src/main/resources/templates/febs/views/modules/member/memberDataInfoAllAloneTest.html
@@ -44,6 +44,7 @@
{field: 'walletCoinNumber', title: '合约账户有余额个数', minWidth: 200,align:'center'},
{field: 'walletCoinNum', title: '合约账户余额', minWidth: 200,align:'center'},
{field: 'agentNum', title: '代理账户余额', minWidth: 200,align:'center'},
+ {field: 'allCoin', title: '平台总资产', minWidth: 200,align:'center'},
{field: 'platformProfitAndLoss', title: '平台剩余USDT',
templet: function (d) {
if (d.platformProfitAndLoss > '0') {
diff --git a/src/main/resources/templates/febs/views/modules/member/memberDataInfoListSearch.html b/src/main/resources/templates/febs/views/modules/member/memberDataInfoListSearch.html
new file mode 100644
index 0000000..4681293
--- /dev/null
+++ b/src/main/resources/templates/febs/views/modules/member/memberDataInfoListSearch.html
@@ -0,0 +1,124 @@
+<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="verifyStatus">
+ <option value="">请选择</option>
+ <option value="1">待审核</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="user-option">
+ <span shiro:lacksPermission="user:view,user:update,user:delete">
+ <span class="layui-badge-dot febs-bg-orange"></span> 无权限
+ </span>
+ <a lay-event="edit" shiro:hasPermission="user:update"><i
+ class="layui-icon febs-edit-area febs-blue"></i></a>
+</script>
+<!-- 表格操作栏 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: 'phone', type: null},
+ tableIns;
+
+ form.render();
+
+ // 表格初始化
+ initTable();
+
+ // 初始化表格操作栏各个按钮功能
+ table.on('tool(userTable)', function (obj) {
+ var data = obj.data,
+ layEvent = obj.event;
+
+ });
+
+ function confirmUsers(id) {
+ febs.get(ctx + 'documentary/traderGetOut/' + id, null, function () {
+ febs.alert.success('踢出成功');
+ $query.click();
+ });
+ }
+ function cancelUsers(id) {
+ febs.get(ctx + 'documentary/traderGetFull/' + id, null, function () {
+ febs.alert.success('设置成功');
+ $query.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();
+ tableIns.reload({where: getQueryParams(), page: {curr: 1}});
+ });
+
+ function initTable() {
+ tableIns = febs.table.init({
+ elem: $view.find('table'),
+ id: 'userTable',
+ url: ctx + 'member/memberDataInfoListSearchs',
+ cols: [[
+ {field: 'phone', title: '手机号', minWidth: 100,align:'left'},
+ {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
--
Gitblit v1.9.1