From d4488a987cccd3ddd51a202a9f8aa71d3cdcbced Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 23 Apr 2021 17:12:16 +0800
Subject: [PATCH] 20210423
---
src/main/java/com/xcong/excoin/modules/agent/controller/MemberController.java | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/agent/controller/MemberController.java b/src/main/java/com/xcong/excoin/modules/agent/controller/MemberController.java
index 08cb052..07fb74b 100644
--- a/src/main/java/com/xcong/excoin/modules/agent/controller/MemberController.java
+++ b/src/main/java/com/xcong/excoin/modules/agent/controller/MemberController.java
@@ -1,5 +1,7 @@
package com.xcong.excoin.modules.agent.controller;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
import com.xcong.excoin.common.controller.BaseController;
import com.xcong.excoin.common.entity.FebsConstant;
import com.xcong.excoin.common.entity.FebsResponse;
@@ -32,6 +34,14 @@
@GetMapping("getList")
public FebsResponse getList(MemberEntity member, QueryRequest request) {
User user = getCurrentUser();
+ String startTimeDate = member.getStartTimeDate();
+ if(StrUtil.isNotEmpty(startTimeDate)){
+ member.setStartTime(DateUtil.parse(startTimeDate));
+ }
+ String endTimeDate = member.getEndTimeDate();
+ if(StrUtil.isNotEmpty(endTimeDate)){
+ member.setEndTime(DateUtil.parse(endTimeDate));
+ }
member.setInviteId(FebsConstant.USER_TYPE_ADMIN.equals(user.getType()) ? FebsConstant.DEFAULT_REFERER_ID : user.getInviteId());
Map<String, Object> data = getDataTable(memberService.findMemberListInPage(member, request));
return new FebsResponse().success().data(data);
@@ -40,8 +50,31 @@
@GetMapping("getFeeAmountList")
public FebsResponse getFeeAmountList(MemberEntity memberEntity, QueryRequest request) {
User user = getCurrentUser();
- memberEntity.setRefererId(FebsConstant.USER_TYPE_ADMIN.equals(user.getType()) ? FebsConstant.DEFAULT_REFERER_ID : user.getInviteId());
+ memberEntity.setRefererIds(FebsConstant.USER_TYPE_ADMIN.equals(user.getType()) ? FebsConstant.DEFAULT_REFERER_ID : user.getInviteId());
Map<String, Object> data = getDataTable(memberService.findFeeAmountList(memberEntity, request));
return new FebsResponse().success().data(data);
}
+
+ /**
+ * 数据总览
+ * @param memberEntity
+ * @param request
+ * @return
+ */
+
+ @GetMapping("allMemberData")
+ public FebsResponse allMemberData(MemberEntity memberEntity, QueryRequest request) {
+ User user = getCurrentUser();
+ memberEntity.setRefererIds(FebsConstant.USER_TYPE_ADMIN.equals(user.getType()) ? FebsConstant.DEFAULT_REFERER_ID : user.getInviteId());
+ Map<String, Object> data = getDataTable(memberService.findAllMemberDataList(memberEntity, request));
+ return new FebsResponse().success().data(data);
+ }
+
+ @GetMapping("getMemberAssets")
+ public FebsResponse getMemberAssets(MemberEntity memberEntity, QueryRequest request) {
+ User user = getCurrentUser();
+ memberEntity.setRefererIds(FebsConstant.USER_TYPE_ADMIN.equals(user.getType()) ? FebsConstant.DEFAULT_REFERER_ID : user.getInviteId());
+ Map<String, Object> data = getDataTable(memberService.findMemberAssetList(memberEntity, request));
+ return new FebsResponse().success().data(data);
+ }
}
--
Gitblit v1.9.1