From 7ba7366a8c6ce8019339e433b218386645cb5312 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 28 Dec 2020 17:38:53 +0800
Subject: [PATCH] Merge branch 'piot' of https://gitee.com/chonggaoxiao/new_excoin_manage into piot

---
 src/main/java/com/xcong/excoin/modules/member/service/IMemberService.java |  157 +++++++++++++++++++++++++++++++++------------------
 1 files changed, 101 insertions(+), 56 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/member/service/IMemberService.java b/src/main/java/com/xcong/excoin/modules/member/service/IMemberService.java
index 8f943e7..4cfc73a 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/IMemberService.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/IMemberService.java
@@ -1,56 +1,101 @@
-package com.xcong.excoin.modules.member.service;
-
-import java.util.List;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-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.MemberCoinChargeEntity;
-import com.xcong.excoin.modules.member.entity.MemberCoinWithdrawEntity;
-import com.xcong.excoin.modules.member.entity.MemberEntity;
-import com.xcong.excoin.modules.member.entity.MemberQuickBuySaleEntity;
-import com.xcong.excoin.modules.member.vo.MemberAuthenticationVo;
-import com.xcong.excoin.modules.member.vo.MemberCoinChargeVo;
-import com.xcong.excoin.modules.member.vo.MemberCoinWithdrawVo;
-import com.xcong.excoin.modules.member.vo.MemberQuickBuySaleVo;
-import com.xcong.excoin.modules.member.vo.MemberQuickSaleVo;
-
-/**
- * @author helius
- */
-public interface IMemberService extends IService<MemberEntity> {
-
-    IPage<MemberEntity> findMemberListInPage(MemberEntity memberEntity, QueryRequest request);
-
-	IPage<MemberQuickBuySaleVo> findmemberQuickBuySaleListInPage(MemberQuickBuySaleEntity memberQuickBuySaleEntity, QueryRequest request);
-
-	FebsResponse memberChargeUsdtConfirm(@NotNull(message = "{required}") Long id);
-
-	FebsResponse memberChargeUsdtCancel(@NotNull(message = "{required}") Long id);
-
-	IPage<MemberQuickSaleVo> findmemberQuickSaleListInPage(MemberQuickBuySaleEntity memberQuickBuySaleEntity, QueryRequest request);
-
-	FebsResponse memberExtractUsdtCancel(@NotNull(message = "{required}") Long id);
-
-	FebsResponse memberExtractUsdtConfirm(@NotNull(message = "{required}") Long id);
-
-	IPage<MemberCoinChargeVo> findMemberApplyCoinListInPage(MemberCoinChargeEntity memberCoinChargeEntity, QueryRequest request);
-
-	IPage<MemberCoinWithdrawVo> findmemberWithdrawCoinListInPage(MemberCoinWithdrawEntity memberCoinWithdrawEntity, QueryRequest request);
-
-	FebsResponse memberWithdrawCoinConfirm(@NotNull(message = "{required}") Long id);
-
-	FebsResponse memberWithdrawCoinCancel(@NotNull(message = "{required}") Long id);
-
-	MemberAuthenticationVo selectMemberAuthenticationById(@NotNull(message = "{required}") long id);
-
-	FebsResponse memberDetailConfirm(@Valid MemberDetailConfirmDto memberDetailConfirmDto);
-
-	List<MemberCoinChargeEntity> selectMemberDataInfoById(long id);
-
-}
+package com.xcong.excoin.modules.member.service;
+
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+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;
+import com.xcong.excoin.modules.member.entity.MemberQuickBuySaleEntity;
+import com.xcong.excoin.modules.member.vo.MemberAuthenticationVo;
+import com.xcong.excoin.modules.member.vo.MemberCoinChargeVo;
+import com.xcong.excoin.modules.member.vo.MemberCoinWithdrawVo;
+import com.xcong.excoin.modules.member.vo.MemberDataInfoVo;
+import com.xcong.excoin.modules.member.vo.MemberInfoDetailVo;
+import com.xcong.excoin.modules.member.vo.MemberQuickBuySaleVo;
+import com.xcong.excoin.modules.member.vo.MemberQuickSaleVo;
+
+/**
+ * @author helius
+ */
+public interface IMemberService extends IService<MemberEntity> {
+
+    IPage<MemberEntity> findMemberListInPage(MemberEntity memberEntity, QueryRequest request);
+
+	IPage<MemberQuickBuySaleVo> findmemberQuickBuySaleListInPage(MemberQuickBuySaleEntity memberQuickBuySaleEntity, QueryRequest request);
+
+	FebsResponse memberChargeUsdtConfirm(@NotNull(message = "{required}") Long id);
+
+	FebsResponse memberChargeUsdtCancel(@NotNull(message = "{required}") Long id);
+
+	IPage<MemberQuickSaleVo> findmemberQuickSaleListInPage(MemberQuickBuySaleEntity memberQuickBuySaleEntity, QueryRequest request);
+
+	FebsResponse memberExtractUsdtCancel(@NotNull(message = "{required}") Long id);
+
+	FebsResponse memberExtractUsdtConfirm(@NotNull(message = "{required}") Long id);
+
+	IPage<MemberCoinChargeVo> findMemberApplyCoinListInPage(MemberCoinChargeEntity memberCoinChargeEntity, QueryRequest request);
+
+	IPage<MemberCoinWithdrawVo> findmemberWithdrawCoinListInPage(MemberCoinWithdrawEntity memberCoinWithdrawEntity, QueryRequest request);
+
+	FebsResponse memberWithdrawCoinConfirm(@NotNull(message = "{required}") Long id) throws ExecutionException, InterruptedException;
+
+	FebsResponse memberWithdrawCoinCancel(@NotNull(message = "{required}") Long id);
+
+	MemberAuthenticationVo selectMemberAuthenticationById(@NotNull(message = "{required}") long id);
+
+	FebsResponse memberDetailConfirm(@Valid MemberDetailConfirmDto memberDetailConfirmDto);
+
+	List<MemberCoinChargeEntity> selectMemberDataInfoById(long id);
+
+	IPage<MemberDataInfoVo> findMemberDataInfoDtoListInPage(MemberEntity memberEntity, QueryRequest request);
+
+	MemberEntity selectMemberByid(long id);
+
+	FebsResponse memberDataInfoList(@NotNull(message = "{required}") long id);
+
+	IPage<AgentFriendRelationEntity> findAgentInfoListInPage(AgentFriendRelationEntity agentFriendRelationEntity, QueryRequest request);
+
+	FebsResponse addCoinConfirm(@Valid MemberEntity memberEntity);
+
+	MemberInfoDetailVo selectMemberInfoDetailById(long id);
+
+	IPage<MemberCoinChargeVo> findmemberApplyCoinAloneInPage(MemberCoinChargeEntity memberCoinChargeEntity, QueryRequest request);
+
+	IPage<MemberCoinWithdrawVo> findMemberWithdrawCoinAloneInPage(MemberCoinWithdrawEntity memberCoinWithdrawEntity, QueryRequest request);
+
+	IPage<MemberEntity> findMemberAloneInPage(MemberEntity member, QueryRequest request);
+
+	IPage<MemberDataInfoVo> findMemberDataInfoAloneDtoListInPage(MemberEntity memberEntity, QueryRequest request);
+
+	IPage<MemberDataInfoVo> findMemberDataInfoAllInPage(MemberEntity memberEntity, QueryRequest request);
+
+	IPage<MemberDataInfoVo> findMemberDataInfoAllAloneListInPage(MemberEntity memberEntity, QueryRequest request);
+
+	IPage<MemberEntity> findMemberListTestInPage(MemberEntity member, QueryRequest request);
+
+	IPage<MemberCoinWithdrawVo> findMemberWithdrawCoinTestListInPage(MemberCoinWithdrawEntity memberCoinWithdrawEntity,
+			QueryRequest request);
+
+	IPage<MemberCoinChargeVo> findMemberApplyCoinAloneTestInPage(MemberCoinChargeEntity memberCoinChargeEntity, QueryRequest request);
+
+	IPage<MemberEntity> findMemberAloneTestInPage(MemberEntity member, QueryRequest request);
+
+	IPage<MemberDataInfoVo> findMemberDataInfoAloneTestDtoListInPage(MemberEntity memberEntity, QueryRequest request);
+
+	IPage<MemberDataInfoVo> findMemberDataInfoAllAloneTestListInPage(MemberEntity memberEntity, QueryRequest request);
+
+	MemberInfoDetailVo selectMemberInfoDetailByInviteId(String inviteId);
+
+	IPage<MemberEntity> memberDataInfoListSearchs(MemberEntity member, QueryRequest request);
+
+}

--
Gitblit v1.9.1