From cfe81b28c817fe4543da6de5fa169ca1e69c7afd Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 14 Jul 2020 11:02:49 +0800
Subject: [PATCH] 20200714 代码提交
---
src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java | 50 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 42 insertions(+), 8 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 be7967d..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
@@ -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.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;
@@ -37,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) {
@@ -126,14 +147,6 @@
*/
@GetMapping("memberWithdrawCoin")
public FebsResponse memberWithdrawCoin(MemberCoinWithdrawEntity memberCoinWithdrawEntity, QueryRequest request) {
- String isInside = memberCoinWithdrawEntity.getIsInside();
- if(!"".equals(isInside) && isInside != null) {
- if("1".equals(isInside)) {
- memberCoinWithdrawEntity.setIsInside("Y");
- }else {
- memberCoinWithdrawEntity.setIsInside("N");
- }
- }
Map<String, Object> data = getDataTable(memberService.findmemberWithdrawCoinListInPage(memberCoinWithdrawEntity, request));
return new FebsResponse().success().data(data);
}
@@ -158,4 +171,25 @@
return memberService.memberWithdrawCoinCancel(id);
}
+ /**
+ * 平台详细信息---列表
+ */
+ @GetMapping("memberDataInfo")
+ public FebsResponse memberDataInfo(MemberEntity memberEntity, QueryRequest request) {
+ Map<String, Object> data = getDataTable(memberService.findMemberDataInfoDtoListInPage(memberEntity, request));
+ 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