From a3f86d22b6b9d5ab4a335488ddaf8edf3aa5f787 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Thu, 03 Jun 2021 16:45:08 +0800 Subject: [PATCH] modify --- src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java | 24 ++++++++++++++++++++++++ 1 files changed, 24 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 a34c748..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; @@ -41,6 +42,29 @@ 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); + } + + /** *会员列表---拨币 * @return */ -- Gitblit v1.9.1