From ad959c3690aea52a0e54e92b001d1959c26c4cc4 Mon Sep 17 00:00:00 2001
From: 2019232 <zh123456>
Date: Wed, 14 Dec 2022 15:40:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/BNBWEB' into BNBWEB
---
src/main/java/cc/mrbird/febs/dapp/controller/MemberController.java | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 47 insertions(+), 0 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 9c0b13a..f4e4071 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/MemberController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/MemberController.java
@@ -3,11 +3,16 @@
import cc.mrbird.febs.common.controller.BaseController;
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
+import cc.mrbird.febs.common.utils.FebsUtil;
import cc.mrbird.febs.dapp.chain.ChainService;
import cc.mrbird.febs.dapp.dto.PriceSettingDto;
import cc.mrbird.febs.dapp.entity.DappMemberEntity;
+import cc.mrbird.febs.dapp.entity.DappSystemProfit;
import cc.mrbird.febs.dapp.entity.DappTransferRecordEntity;
import cc.mrbird.febs.dapp.service.DappMemberService;
+import cc.mrbird.febs.dapp.vo.AdminSystemFeeVo;
+import cc.mrbird.febs.system.entity.User;
+import cn.hutool.core.util.ObjectUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.annotations.Param;
@@ -82,4 +87,46 @@
dappMemberService.setNewestPrice(priceSettingDto);
return new FebsResponse().success();
}
+
+ @PostMapping(value = "/setSystemFee")
+ public FebsResponse setSystemFee(AdminSystemFeeVo adminSystemFeeVo) {
+ dappMemberService.setSystemFee(adminSystemFeeVo);
+ return new FebsResponse().success();
+ }
+
+ /**
+ * 动能列表
+ * @return
+ */
+ @RequestMapping(value = "/systemProfitList")
+ public FebsResponse systemProfitList(DappSystemProfit dappSystemProfit, QueryRequest request) {
+ return new FebsResponse().success().data(getDataTable(dappMemberService.selectSystemProfitInPage(dappSystemProfit, request)));
+ }
+
+ /**
+ * 动能列表-流水详情
+ * @return
+ */
+ @GetMapping("getSystemProfitFlowList")
+ public FebsResponse getSystemProfitFlowList(DappSystemProfit dappSystemProfit, QueryRequest request, Integer parentId) {
+ if (parentId == null) {
+ ViewController.systemProfitId = 0L;
+ }
+ dappSystemProfit.setId(ViewController.systemProfitId);
+ Map<String, Object> data = getDataTable(dappMemberService.getSystemProfitFlowList(dappSystemProfit, request));
+ return new FebsResponse().success().data(data);
+ }
+
+ /**
+ * 用户列表-团队详情
+ */
+ @GetMapping("teamInfo")
+ public FebsResponse teamInfo(DappMemberEntity dappMemberEntity, QueryRequest request, Integer parentId) {
+ if (parentId == null) {
+ ViewController.teamInfoMemberId = 0L;
+ }
+ dappMemberEntity.setId(ViewController.teamInfoMemberId);
+ Map<String, Object> data = getDataTable(dappMemberService.getTeamInfo(dappMemberEntity,request));
+ return new FebsResponse().success().data(data);
+ }
}
--
Gitblit v1.9.1