From d8d2cfd30edf712f42b64db7df14894109768bc1 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 15 Jul 2020 15:43:48 +0800
Subject: [PATCH] modify

---
 src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java |   35 +++++++++++++++++++++++++++++++++--
 1 files changed, 33 insertions(+), 2 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 786df94..44d250a 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
@@ -4,8 +4,8 @@
 import com.xcong.excoin.common.controller.BaseController;
 import com.xcong.excoin.common.entity.FebsResponse;
 import com.xcong.excoin.common.entity.QueryRequest;
-import com.xcong.excoin.modules.member.dto.MemberDataInfoDto;
 import com.xcong.excoin.modules.member.dto.MemberDetailConfirmDto;
+import com.xcong.excoin.modules.member.entity.AgentFriendRelationEntity;
 import com.xcong.excoin.modules.member.entity.MemberCoinChargeEntity;
 import com.xcong.excoin.modules.member.entity.MemberCoinWithdrawEntity;
 import com.xcong.excoin.modules.member.entity.MemberEntity;
@@ -38,6 +38,26 @@
 public class MemberController extends BaseController {
 
     private final IMemberService memberService;
+    
+    /**
+     *会员列表---拨币
+     * @return
+     */
+    @PostMapping("addCoinConfirm")
+    @ControllerEndpoint(operation = "交易设置---确认", exceptionMessage = "设置失败")
+    public FebsResponse addCoinConfirm(@Valid MemberEntity memberEntity) {
+        return memberService.addCoinConfirm(memberEntity);
+    }
+    
+    /**
+     * 代理关系---列表
+     * @return
+     */
+    @GetMapping("agentInfoList")
+    public FebsResponse agentInfoList(AgentFriendRelationEntity agentFriendRelationEntity, QueryRequest request) {
+        Map<String, Object> data = getDataTable(memberService.findAgentInfoListInPage(agentFriendRelationEntity, request));
+        return new FebsResponse().success().data(data);
+    }
 
     @GetMapping("getList")
     public FebsResponse getList(MemberEntity member, QueryRequest request) {
@@ -152,7 +172,7 @@
     }
     
     /**
-     * 用户详细信息---列表
+     * 平台详细信息---列表
      */
     @GetMapping("memberDataInfo")
     public FebsResponse memberDataInfo(MemberEntity memberEntity, QueryRequest request) {
@@ -160,5 +180,16 @@
         return new FebsResponse().success().data(data);
     }
     
+    /**
+     * 用户详细信息---列表
+     * @return
+     */
+    @GetMapping("memberDataInfoList")
+    @ControllerEndpoint(operation = "用户详细信息---充币记录", exceptionMessage = "取消失败")
+    public FebsResponse memberDataInfoList(MemberCoinChargeEntity memberCoinChargeEntity, QueryRequest request) {
+    	Map<String, Object> data = getDataTable(memberService.findMemberApplyCoinListInPage(memberCoinChargeEntity, request));
+        return new FebsResponse().success().data(data);
+    }
+    
     
 }

--
Gitblit v1.9.1