From 7572b8dbd4c41ca9b6437a032da2aa1a0fdd5444 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 17 May 2021 18:18:09 +0800
Subject: [PATCH] 20210517 云顶
---
src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
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 2e1a9aa..b941fbc 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
@@ -5,6 +5,7 @@
import com.xcong.excoin.common.entity.FebsResponse;
import com.xcong.excoin.common.entity.QueryRequest;
import com.xcong.excoin.modules.member.dto.MemberDetailConfirmDto;
+import com.xcong.excoin.modules.member.entity.ActivityReceiveRecord;
import com.xcong.excoin.modules.member.entity.AgentFriendRelationEntity;
import com.xcong.excoin.modules.member.entity.MemberAccountMoneyChangeEntity;
import com.xcong.excoin.modules.member.entity.MemberCoinChargeEntity;
@@ -39,6 +40,29 @@
public class MemberController extends BaseController {
private final IMemberService memberService;
+
+ /**
+ * 会员列表---会员活动领取---详情
+ */
+ @GetMapping("/seeReceiveInfo")
+ public FebsResponse seeReceiveInfo(QueryRequest request, ActivityReceiveRecord activityReceiveRecord,Integer parentId) {
+ if(parentId==null){
+ ViewController.idFromMember=0;
+ }
+ activityReceiveRecord.setId(ViewController.idFromMember);
+ Map<String, Object> dataTable = getDataTable(memberService.seeReceiveInfo(request, activityReceiveRecord));
+ return new FebsResponse().success().data(dataTable);
+ }
+
+ /**
+ * 会员列表---会员活动领取
+ * @return
+ */
+ @GetMapping("memberActivityReceive")
+ public FebsResponse memberActivityReceive(ActivityReceiveRecord activityReceiveRecord, QueryRequest request) {
+ Map<String, Object> data = getDataTable(memberService.memberActivityReceive(activityReceiveRecord, request));
+ return new FebsResponse().success().data(data);
+ }
/**
*会员列表---拨币
@@ -437,6 +461,15 @@
Map<String, Object> data = getDataTable(memberService.findMemberApplyCoinListInPage(memberCoinChargeEntity, request));
return new FebsResponse().success().data(data);
}
+
+ /**
+ * 平台全部信息---列表Test===加查询
+ */
+ @GetMapping("allDataInfo")
+ public FebsResponse allDataInfo(MemberEntity memberEntity, QueryRequest request) {
+ Map<String, Object> data = getDataTable(memberService.findAllDataInfoListInPage(memberEntity, request));
+ return new FebsResponse().success().data(data);
+ }
}
--
Gitblit v1.9.1