From 5ba2cfd4a38752e6b9d6e2c93f673a491d89730f Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 21 Jun 2024 14:41:39 +0800
Subject: [PATCH] 后台矩阵列表
---
src/main/resources/mapper/dapp/DbMemberNodeMapper.xml | 17 ++++++++
src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java | 7 +--
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 7 +++
src/main/java/cc/mrbird/febs/dapp/controller/MemberController.java | 14 +++++--
src/main/java/cc/mrbird/febs/dapp/entity/DbMemberNode.java | 4 ++
src/main/java/cc/mrbird/febs/dapp/mapper/DbMemberNodeMapper.java | 3 +
src/main/resources/templates/febs/views/dapp/member-transter.html | 21 ++--------
7 files changed, 47 insertions(+), 26 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/MemberController.java b/src/main/java/cc/mrbird/febs/dapp/controller/MemberController.java
index 8cf5a19..df4464f 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/MemberController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/MemberController.java
@@ -7,17 +7,18 @@
import cc.mrbird.febs.dapp.dto.PriceSettingDto;
import cc.mrbird.febs.dapp.entity.DappMemberEntity;
import cc.mrbird.febs.dapp.entity.DappTransferRecordEntity;
+import cc.mrbird.febs.dapp.entity.DbMemberNode;
import cc.mrbird.febs.dapp.service.DappMemberService;
import cc.mrbird.febs.dapp.vo.AdminSystemFeeVo;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Controller;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
import java.math.BigDecimal;
-import java.util.HashMap;
import java.util.Map;
/**
@@ -78,6 +79,11 @@
return new FebsResponse().success().data(getDataTable(dappMemberService.selectTransferInPage(transfer, request)));
}
+ @RequestMapping(value = "/memberNodeList")
+ public FebsResponse memberNodeList(DbMemberNode dbMemberNode, QueryRequest request) {
+ return new FebsResponse().success().data(getDataTable(dappMemberService.memberNodeList(dbMemberNode, request)));
+ }
+
@PostMapping(value = "/setNewestPrice")
public FebsResponse setNewestPrice(PriceSettingDto priceSettingDto) {
dappMemberService.setNewestPrice(priceSettingDto);
diff --git a/src/main/java/cc/mrbird/febs/dapp/entity/DbMemberNode.java b/src/main/java/cc/mrbird/febs/dapp/entity/DbMemberNode.java
index 913c121..d7de984 100644
--- a/src/main/java/cc/mrbird/febs/dapp/entity/DbMemberNode.java
+++ b/src/main/java/cc/mrbird/febs/dapp/entity/DbMemberNode.java
@@ -1,6 +1,7 @@
package cc.mrbird.febs.dapp.entity;
import cc.mrbird.febs.common.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@@ -25,4 +26,7 @@
public static final int STATE_ONE = 1;
public static final int STATE_TWO = 2;
+ @TableField(exist = false)
+ private String address;
+
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/mapper/DbMemberNodeMapper.java b/src/main/java/cc/mrbird/febs/dapp/mapper/DbMemberNodeMapper.java
index 0301ff2..107d0f2 100644
--- a/src/main/java/cc/mrbird/febs/dapp/mapper/DbMemberNodeMapper.java
+++ b/src/main/java/cc/mrbird/febs/dapp/mapper/DbMemberNodeMapper.java
@@ -2,6 +2,8 @@
import cc.mrbird.febs.dapp.entity.DbMemberNode;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
@@ -13,4 +15,5 @@
List<DbMemberNode> selectListByDate(@Param("date") Date date);
+ IPage<DbMemberNode> selectListInPage(@Param("record")DbMemberNode dbMemberNode, Page<DbMemberNode> page);
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java b/src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java
index 49fd533..5a33ebb 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java
@@ -4,16 +4,13 @@
import cc.mrbird.febs.dapp.dto.ApproveDto;
import cc.mrbird.febs.dapp.dto.ConnectDto;
import cc.mrbird.febs.dapp.dto.PriceSettingDto;
-import cc.mrbird.febs.dapp.dto.TeamListDto;
import cc.mrbird.febs.dapp.entity.DappMemberEntity;
import cc.mrbird.febs.dapp.entity.DappTransferRecordEntity;
+import cc.mrbird.febs.dapp.entity.DbMemberNode;
import cc.mrbird.febs.dapp.vo.AdminSystemFeeVo;
import cc.mrbird.febs.dapp.vo.TeamListVo;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-import java.util.Map;
public interface DappMemberService extends IService<DappMemberEntity> {
@@ -46,4 +43,6 @@
TeamListVo findTeamList();
void setSystemFee(AdminSystemFeeVo adminSystemFeeVo);
+
+ IPage<DbMemberNode> memberNodeList(DbMemberNode dbMemberNode, QueryRequest request);
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
index 1350b7f..732eece 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
@@ -54,6 +54,7 @@
private final DappAchieveMemberTreeDao dappAchieveMemberTreeDao;
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
private final DappFundFlowDao dappFundFlowDao;
+ private final DbMemberNodeMapper dbMemberNodeMapper;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -383,6 +384,12 @@
dataDictionaryCustomMapper.updateById(symbolPriceDic);
}
+ @Override
+ public IPage<DbMemberNode> memberNodeList(DbMemberNode dbMemberNode, QueryRequest request) {
+ Page<DbMemberNode> page = new Page<>(request.getPageNum(), request.getPageSize());
+ return dbMemberNodeMapper.selectListInPage(dbMemberNode, page);
+ }
+
public TeamListVo buildTeamMatrix(DappAchieveMemberTreeEntity node) {
List<DappAchieveMemberTreeEntity> childNodes = dappAchieveMemberTreeDao.selectMatrixChildNode(node.getTopNode(), node.getTreeNode());
diff --git a/src/main/resources/mapper/dapp/DbMemberNodeMapper.xml b/src/main/resources/mapper/dapp/DbMemberNodeMapper.xml
index 2baf905..debc6d0 100644
--- a/src/main/resources/mapper/dapp/DbMemberNodeMapper.xml
+++ b/src/main/resources/mapper/dapp/DbMemberNodeMapper.xml
@@ -18,9 +18,24 @@
select
*
from
- db_member_node
+ db_member_node
where date_format(create_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
</select>
+ <select id="selectListInPage" resultType="cc.mrbird.febs.dapp.entity.DbMemberNode">
+ select
+ a.*,
+ b.address address
+ from
+ db_member_node a
+ left join dapp_member b on a.member_id = b.id
+ <where>
+ <if test="record.address != '' and record.address != null">
+ and b.address = #{record.address}
+ </if>
+ </where>
+ order by a.create_time desc
+ </select>
+
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/dapp/member-transter.html b/src/main/resources/templates/febs/views/dapp/member-transter.html
index e2370a6..92a1494 100644
--- a/src/main/resources/templates/febs/views/dapp/member-transter.html
+++ b/src/main/resources/templates/febs/views/dapp/member-transter.html
@@ -35,18 +35,6 @@
height: auto !important;
}
</style>
-
-<script type="text/html" id="transfer-option">
- {{# if(d.chainType == 'TRX') { }}
- <a href="https://tronscan.io/?#/transaction/{{d.hash}}" target="_blank"><i class="layui-icon febs-edit-area febs-green"></i></a>
- {{# } else if (d.chainType == 'ETH') { }}
- <a href="https://etherscan.io/tx/{{d.hash}}" target="_blank"><i class="layui-icon febs-edit-area febs-green"></i></a>
- {{# } else if (d.chainType == 'BSC') { }}
- <a href="https://bscscan.com/tx/{{d.hash}}" target="_blank"><i class="layui-icon febs-edit-area febs-green"></i></a>
- {{# } else { }}
- <span>-</span>
- {{# } }}
-</script>
<script data-th-inline="none" type="text/javascript">
layui.use(['dropdown', 'jquery', 'laydate', 'form', 'table', 'febs', 'treeSelect'], function () {
var $ = layui.jquery,
@@ -96,14 +84,13 @@
tableIns = febs.table.init({
elem: $view.find('table'),
id: 'transferTable',
- url: ctx + 'member/transferList',
+ url: ctx + 'member/memberNodeList',
cols: [[
{field: 'address', title: '地址', minWidth: 130},
- {field: 'amount', title: '金额(USDT)', minWidth: 130},
- {field: 'chainType', title: '链', minWidth: 80},
- {field: 'hash', title: '交易hash', minWidth: 180},
+ {field: 'countFund', title: '轮数', minWidth: 180},
+ {field: 'type', title: '星团等级', minWidth: 130},
+ {field: 'amount', title: '金额', minWidth: 80},
{field: 'createTime', title: '创建时间', minWidth: 130},
- {title: '操作', toolbar: '#transfer-option', minWidth: 140}
]]
});
}
--
Gitblit v1.9.1