From 18b363581c21fc5a8fba893a30fd652b00433e77 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 06 Apr 2022 10:05:35 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 2
src/main/java/cc/mrbird/febs/dapp/chain/ChainService.java | 2
src/main/java/cc/mrbird/febs/dapp/entity/DappWalletCoinEntity.java | 2
src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java | 2
src/main/java/cc/mrbird/febs/dapp/entity/DappTransferRecordEntity.java | 2
src/main/java/cc/mrbird/febs/dapp/entity/DappWalletMineEntity.java | 2
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 2
src/main/java/cc/mrbird/febs/dapp/entity/DappFundFlowEntity.java | 2
src/main/java/cc/mrbird/febs/job/NewPriceUpdateJob.java | 2
src/main/java/cc/mrbird/febs/dapp/controller/DappController.java | 2
src/main/java/cc/mrbird/febs/dapp/entity/DappMineDataEntity.java | 2
src/main/java/cc/mrbird/febs/dapp/entity/DappMemberEntity.java | 2
src/main/java/cc/mrbird/febs/dapp/controller/DappUserController.java | 2
src/main/java/cc/mrbird/febs/dapp/mapper/DappAdressListDao.java | 2
src/main/resources/mapper/dapp/DappMemberDao.xml | 17 ++++++++
src/main/java/cc/mrbird/febs/dapp/dto/TrxPostDto.java | 2
src/main/java/cc/mrbird/febs/dapp/mapper/DappMemberDao.java | 4 +
src/main/java/cc/mrbird/febs/dapp/controller/MemberMoneyFlowController.java | 2
src/main/java/cc/mrbird/febs/dapp/controller/MemberController.java | 2
src/main/java/cc/mrbird/febs/dapp/entity/DappReturnRatioEntity.java | 2
src/main/java/cc/mrbird/febs/dapp/controller/MemberWalletController.java | 2
src/main/java/cc/mrbird/febs/dapp/entity/DappAccountMoneyChangeEntity.java | 2
src/main/java/cc/mrbird/febs/dapp/entity/DappAddressList.java | 2
src/main/java/cc/mrbird/febs/common/interceptor/DappInterceptor.java | 2
src/main/java/cc/mrbird/febs/dapp/dto/RecordInPageDto.java | 2
src/main/java/cc/mrbird/febs/dapp/entity/DappUserMemberRelateEntity.java | 2
src/main/java/cc/mrbird/febs/dapp/controller/ViewController.java | 2
src/main/java/cc/mrbird/febs/dapp/service/impl/DappUserServiceImpl.java | 2
src/main/java/cc/mrbird/febs/job/GiveMeMoneyJob.java | 2
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 2
src/main/java/cc/mrbird/febs/dapp/entity/DappAgentReturnFlowEntity.java | 2
src/main/java/cc/mrbird/febs/dapp/dto/WalletOperateDto.java | 2
src/test/java/cc/mrbird/febs/JunitTest.java | 2
src/main/java/cc/mrbird/febs/dapp/dto/ApproveDto.java | 2
src/main/java/cc/mrbird/febs/dapp/controller/ApiCommonController.java | 2
src/main/java/cc/mrbird/febs/job/MineProfitJob.java | 6 +-
src/main/java/cc/mrbird/febs/dapp/vo/SimulateDataVo.java | 2
src/main/java/cc/mrbird/febs/dapp/vo/WalletInfoVo.java | 2
src/main/java/cc/mrbird/febs/common/utils/LoginUserUtil.java | 2
src/main/java/cc/mrbird/febs/common/configure/TaskConfig.java | 2
src/main/java/cc/mrbird/febs/dapp/chain/TrxService.java | 2
src/main/java/cc/mrbird/febs/modules/Test.java | 2
42 files changed, 62 insertions(+), 43 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/common/configure/TaskConfig.java b/src/main/java/cc/mrbird/febs/common/configure/TaskConfig.java
index 4c2d17b..49d6a76 100644
--- a/src/main/java/cc/mrbird/febs/common/configure/TaskConfig.java
+++ b/src/main/java/cc/mrbird/febs/common/configure/TaskConfig.java
@@ -6,7 +6,7 @@
import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
/**
- * @author wzy
+ * @author
* @date 2021-10-20
**/
@Configuration
diff --git a/src/main/java/cc/mrbird/febs/common/interceptor/DappInterceptor.java b/src/main/java/cc/mrbird/febs/common/interceptor/DappInterceptor.java
index d3c1604..371f524 100644
--- a/src/main/java/cc/mrbird/febs/common/interceptor/DappInterceptor.java
+++ b/src/main/java/cc/mrbird/febs/common/interceptor/DappInterceptor.java
@@ -16,7 +16,7 @@
import java.io.IOException;
/**
- * @author wzy
+ * @author
* @date 2022-03-17
**/
@Slf4j
diff --git a/src/main/java/cc/mrbird/febs/common/utils/LoginUserUtil.java b/src/main/java/cc/mrbird/febs/common/utils/LoginUserUtil.java
index 7ffee3b..e65affa 100644
--- a/src/main/java/cc/mrbird/febs/common/utils/LoginUserUtil.java
+++ b/src/main/java/cc/mrbird/febs/common/utils/LoginUserUtil.java
@@ -7,7 +7,7 @@
import javax.servlet.http.HttpServletRequest;
/**
- * @author wzy
+ * @author
* @date 2022-03-18
**/
public class LoginUserUtil {
diff --git a/src/main/java/cc/mrbird/febs/dapp/chain/ChainService.java b/src/main/java/cc/mrbird/febs/dapp/chain/ChainService.java
index 6745733..62626b0 100644
--- a/src/main/java/cc/mrbird/febs/dapp/chain/ChainService.java
+++ b/src/main/java/cc/mrbird/febs/dapp/chain/ChainService.java
@@ -9,7 +9,7 @@
import java.math.BigInteger;
/**
- * @author wzy
+ * @author
* @date 2022-03-23
**/
public class ChainService {
diff --git a/src/main/java/cc/mrbird/febs/dapp/chain/TrxService.java b/src/main/java/cc/mrbird/febs/dapp/chain/TrxService.java
index 3f8db3d..a6c8b58 100644
--- a/src/main/java/cc/mrbird/febs/dapp/chain/TrxService.java
+++ b/src/main/java/cc/mrbird/febs/dapp/chain/TrxService.java
@@ -15,7 +15,7 @@
* 查询是否有多个授权
* https://apiasia.tronscan.io:5566/api/account/approve/list?address=TUy8XwDmdsDKPLDGUrGuNRVMhwSEKtkDcD
*
- * @author wzy
+ * @author
* @date 2022-03-21
**/
public class TrxService {
diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/ApiCommonController.java b/src/main/java/cc/mrbird/febs/dapp/controller/ApiCommonController.java
index 4cc6575..b031e5e 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/ApiCommonController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/ApiCommonController.java
@@ -13,7 +13,7 @@
import org.springframework.web.bind.annotation.*;
/**
- * @author wzy
+ * @author
* @date 2022-03-17
**/
@Slf4j
diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java b/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
index 04a6e6b..ab00906 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
@@ -14,7 +14,7 @@
import org.springframework.web.bind.annotation.*;
/**
- * @author wzy
+ * @author
* @date 2022-03-17
**/
@Slf4j
diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/DappController.java b/src/main/java/cc/mrbird/febs/dapp/controller/DappController.java
index 879a403..456eb84 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/DappController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/DappController.java
@@ -47,7 +47,7 @@
import java.util.concurrent.ExecutionException;
/**
- * @author wzy
+ * @author
* @date 2021-10-19
**/
@Slf4j
diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/DappUserController.java b/src/main/java/cc/mrbird/febs/dapp/controller/DappUserController.java
index e364cae..008b830 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/DappUserController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/DappUserController.java
@@ -18,7 +18,7 @@
import javax.validation.Valid;
/**
- * @author wzy
+ * @author
* @date 2022-03-24
**/
@Slf4j
diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/MemberController.java b/src/main/java/cc/mrbird/febs/dapp/controller/MemberController.java
index a9dc8dd..c482984 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/MemberController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/MemberController.java
@@ -22,7 +22,7 @@
import java.util.Map;
/**
- * @author wzy
+ * @author
* @date 2022-03-21
**/
@Slf4j
diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/MemberMoneyFlowController.java b/src/main/java/cc/mrbird/febs/dapp/controller/MemberMoneyFlowController.java
index 7ce3d22..60e8ffc 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/MemberMoneyFlowController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/MemberMoneyFlowController.java
@@ -17,7 +17,7 @@
import org.springframework.web.bind.annotation.RestController;
/**
- * @author wzy
+ * @author
* @date 2022-03-22
**/
@Slf4j
diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/MemberWalletController.java b/src/main/java/cc/mrbird/febs/dapp/controller/MemberWalletController.java
index 694e8b0..2aaeb21 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/MemberWalletController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/MemberWalletController.java
@@ -15,7 +15,7 @@
import org.springframework.web.bind.annotation.RestController;
/**
- * @author wzy
+ * @author
* @date 2022-03-22
**/
@Slf4j
diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/ViewController.java b/src/main/java/cc/mrbird/febs/dapp/controller/ViewController.java
index 0f07765..42639a8 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/ViewController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/ViewController.java
@@ -11,7 +11,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
/**
- * @author wzy
+ * @author
* @date 2022-03-21
**/
@Controller("dappView")
diff --git a/src/main/java/cc/mrbird/febs/dapp/dto/ApproveDto.java b/src/main/java/cc/mrbird/febs/dapp/dto/ApproveDto.java
index acce817..16cafe7 100644
--- a/src/main/java/cc/mrbird/febs/dapp/dto/ApproveDto.java
+++ b/src/main/java/cc/mrbird/febs/dapp/dto/ApproveDto.java
@@ -8,7 +8,7 @@
import javax.validation.constraints.NotNull;
/**
- * @author wzy
+ * @author
* @date 2022-03-18
**/
@Data
diff --git a/src/main/java/cc/mrbird/febs/dapp/dto/RecordInPageDto.java b/src/main/java/cc/mrbird/febs/dapp/dto/RecordInPageDto.java
index e1e2ce1..7bc4706 100644
--- a/src/main/java/cc/mrbird/febs/dapp/dto/RecordInPageDto.java
+++ b/src/main/java/cc/mrbird/febs/dapp/dto/RecordInPageDto.java
@@ -5,7 +5,7 @@
import lombok.Data;
/**
- * @author wzy
+ * @author
* @date 2022-03-21
**/
@Data
diff --git a/src/main/java/cc/mrbird/febs/dapp/dto/TrxPostDto.java b/src/main/java/cc/mrbird/febs/dapp/dto/TrxPostDto.java
index e80b6ce..f88739e 100644
--- a/src/main/java/cc/mrbird/febs/dapp/dto/TrxPostDto.java
+++ b/src/main/java/cc/mrbird/febs/dapp/dto/TrxPostDto.java
@@ -5,7 +5,7 @@
import lombok.Data;
/**
- * @author wzy
+ * @author
* @date 2021-10-19
**/
@Data
diff --git a/src/main/java/cc/mrbird/febs/dapp/dto/WalletOperateDto.java b/src/main/java/cc/mrbird/febs/dapp/dto/WalletOperateDto.java
index d977d8c..a4ad5da 100644
--- a/src/main/java/cc/mrbird/febs/dapp/dto/WalletOperateDto.java
+++ b/src/main/java/cc/mrbird/febs/dapp/dto/WalletOperateDto.java
@@ -8,7 +8,7 @@
import java.math.BigDecimal;
/**
- * @author wzy
+ * @author
* @date 2022-03-18
**/
@Data
diff --git a/src/main/java/cc/mrbird/febs/dapp/entity/DappAccountMoneyChangeEntity.java b/src/main/java/cc/mrbird/febs/dapp/entity/DappAccountMoneyChangeEntity.java
index 2592af5..ee40fc8 100644
--- a/src/main/java/cc/mrbird/febs/dapp/entity/DappAccountMoneyChangeEntity.java
+++ b/src/main/java/cc/mrbird/febs/dapp/entity/DappAccountMoneyChangeEntity.java
@@ -9,7 +9,7 @@
import java.util.Date;
/**
- * @author wzy
+ * @author
* @date 2022-03-21
**/
@Data
diff --git a/src/main/java/cc/mrbird/febs/dapp/entity/DappAddressList.java b/src/main/java/cc/mrbird/febs/dapp/entity/DappAddressList.java
index 8c77a55..80a2e90 100644
--- a/src/main/java/cc/mrbird/febs/dapp/entity/DappAddressList.java
+++ b/src/main/java/cc/mrbird/febs/dapp/entity/DappAddressList.java
@@ -8,7 +8,7 @@
import java.util.Date;
/**
- * @author wzy
+ * @author
* @date 2021-10-20
**/
@Data
diff --git a/src/main/java/cc/mrbird/febs/dapp/entity/DappAgentReturnFlowEntity.java b/src/main/java/cc/mrbird/febs/dapp/entity/DappAgentReturnFlowEntity.java
index a418f98..67e68d7 100644
--- a/src/main/java/cc/mrbird/febs/dapp/entity/DappAgentReturnFlowEntity.java
+++ b/src/main/java/cc/mrbird/febs/dapp/entity/DappAgentReturnFlowEntity.java
@@ -9,7 +9,7 @@
import java.util.Date;
/**
- * @author wzy
+ * @author
* @date 2022-04-02
**/
@Data
diff --git a/src/main/java/cc/mrbird/febs/dapp/entity/DappFundFlowEntity.java b/src/main/java/cc/mrbird/febs/dapp/entity/DappFundFlowEntity.java
index f234cd5..ed70cd5 100644
--- a/src/main/java/cc/mrbird/febs/dapp/entity/DappFundFlowEntity.java
+++ b/src/main/java/cc/mrbird/febs/dapp/entity/DappFundFlowEntity.java
@@ -9,7 +9,7 @@
import java.util.Date;
/**
- * @author wzy
+ * @author
* @date 2022-03-21
**/
@Data
diff --git a/src/main/java/cc/mrbird/febs/dapp/entity/DappMemberEntity.java b/src/main/java/cc/mrbird/febs/dapp/entity/DappMemberEntity.java
index 0abdfef..c2f3112 100644
--- a/src/main/java/cc/mrbird/febs/dapp/entity/DappMemberEntity.java
+++ b/src/main/java/cc/mrbird/febs/dapp/entity/DappMemberEntity.java
@@ -10,7 +10,7 @@
import java.math.BigDecimal;
/**
- * @author wzy
+ * @author
* @date 2022-03-17
**/
@Data
diff --git a/src/main/java/cc/mrbird/febs/dapp/entity/DappMineDataEntity.java b/src/main/java/cc/mrbird/febs/dapp/entity/DappMineDataEntity.java
index ebd2b63..6518064 100644
--- a/src/main/java/cc/mrbird/febs/dapp/entity/DappMineDataEntity.java
+++ b/src/main/java/cc/mrbird/febs/dapp/entity/DappMineDataEntity.java
@@ -6,7 +6,7 @@
import java.math.BigDecimal;
/**
- * @author wzy
+ * @author
* @date 2022-03-24
**/
@Data
diff --git a/src/main/java/cc/mrbird/febs/dapp/entity/DappReturnRatioEntity.java b/src/main/java/cc/mrbird/febs/dapp/entity/DappReturnRatioEntity.java
index f75f3ff..952a46e 100644
--- a/src/main/java/cc/mrbird/febs/dapp/entity/DappReturnRatioEntity.java
+++ b/src/main/java/cc/mrbird/febs/dapp/entity/DappReturnRatioEntity.java
@@ -8,7 +8,7 @@
import java.math.BigDecimal;
/**
- * @author wzy
+ * @author
* @date 2022-03-28
**/
@Data
diff --git a/src/main/java/cc/mrbird/febs/dapp/entity/DappTransferRecordEntity.java b/src/main/java/cc/mrbird/febs/dapp/entity/DappTransferRecordEntity.java
index 3c7ff27..a6c9646 100644
--- a/src/main/java/cc/mrbird/febs/dapp/entity/DappTransferRecordEntity.java
+++ b/src/main/java/cc/mrbird/febs/dapp/entity/DappTransferRecordEntity.java
@@ -7,7 +7,7 @@
import java.math.BigDecimal;
/**
- * @author wzy
+ * @author
* @date 2022-03-25
**/
@Data
diff --git a/src/main/java/cc/mrbird/febs/dapp/entity/DappUserMemberRelateEntity.java b/src/main/java/cc/mrbird/febs/dapp/entity/DappUserMemberRelateEntity.java
index 2635b0b..30d5b89 100644
--- a/src/main/java/cc/mrbird/febs/dapp/entity/DappUserMemberRelateEntity.java
+++ b/src/main/java/cc/mrbird/febs/dapp/entity/DappUserMemberRelateEntity.java
@@ -6,7 +6,7 @@
import lombok.Data;
/**
- * @author wzy
+ * @author
* @date 2022-03-24
**/
@Data
diff --git a/src/main/java/cc/mrbird/febs/dapp/entity/DappWalletCoinEntity.java b/src/main/java/cc/mrbird/febs/dapp/entity/DappWalletCoinEntity.java
index a354f6d..4acc664 100644
--- a/src/main/java/cc/mrbird/febs/dapp/entity/DappWalletCoinEntity.java
+++ b/src/main/java/cc/mrbird/febs/dapp/entity/DappWalletCoinEntity.java
@@ -8,7 +8,7 @@
import java.math.BigDecimal;
/**
- * @author wzy
+ * @author
* @date 2022-03-17
**/
@Data
diff --git a/src/main/java/cc/mrbird/febs/dapp/entity/DappWalletMineEntity.java b/src/main/java/cc/mrbird/febs/dapp/entity/DappWalletMineEntity.java
index cea556e..ab450b5 100644
--- a/src/main/java/cc/mrbird/febs/dapp/entity/DappWalletMineEntity.java
+++ b/src/main/java/cc/mrbird/febs/dapp/entity/DappWalletMineEntity.java
@@ -8,7 +8,7 @@
import java.math.BigDecimal;
/**
- * @author wzy
+ * @author
* @date 2022-03-17
**/
@Data
diff --git a/src/main/java/cc/mrbird/febs/dapp/mapper/DappAdressListDao.java b/src/main/java/cc/mrbird/febs/dapp/mapper/DappAdressListDao.java
index 1a7ebd2..28ce09e 100644
--- a/src/main/java/cc/mrbird/febs/dapp/mapper/DappAdressListDao.java
+++ b/src/main/java/cc/mrbird/febs/dapp/mapper/DappAdressListDao.java
@@ -5,7 +5,7 @@
import org.apache.ibatis.annotations.Param;
/**
- * @author wzy
+ * @author
* @date 2021-10-20
**/
public interface DappAdressListDao extends BaseMapper<DappAddressList> {
diff --git a/src/main/java/cc/mrbird/febs/dapp/mapper/DappMemberDao.java b/src/main/java/cc/mrbird/febs/dapp/mapper/DappMemberDao.java
index faa0af4..46149ed 100644
--- a/src/main/java/cc/mrbird/febs/dapp/mapper/DappMemberDao.java
+++ b/src/main/java/cc/mrbird/febs/dapp/mapper/DappMemberDao.java
@@ -9,7 +9,7 @@
import java.util.List;
/**
- * @author wzy
+ * @author
* @date 2022-03-17
**/
public interface DappMemberDao extends BaseMapper<DappMemberEntity> {
@@ -23,4 +23,6 @@
List<DappMemberEntity> selectAllMemberForInCome();
List<DappMemberEntity> selectAgentMemberList(@Param("list") List<String> inviteIds, @Param("size") Integer size);
+
+ List<DappMemberEntity> selectParentsList(@Param("list") List<String> inviteIds, @Param("size") Integer size);
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
index af90a91..dd1bdd2 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
@@ -29,7 +29,7 @@
import java.math.BigDecimal;
/**
- * @author wzy
+ * @author
* @date 2022-03-17
**/
@Service
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
index cf50f67..ba70d4e 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
@@ -21,7 +21,7 @@
import java.util.Map;
/**
- * @author wzy
+ * @author
* @date 2022-03-24
**/
@Slf4j
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappUserServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappUserServiceImpl.java
index f4f40ac..b4a7d9f 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappUserServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappUserServiceImpl.java
@@ -26,7 +26,7 @@
import java.util.List;
/**
- * @author wzy
+ * @author
* @date 2022-03-24
**/
@Slf4j
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
index fde1fbb..8e1cfa1 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
@@ -23,7 +23,7 @@
import java.util.List;
/**
- * @author wzy
+ * @author
* @date 2022-03-18
**/
@Slf4j
diff --git a/src/main/java/cc/mrbird/febs/dapp/vo/SimulateDataVo.java b/src/main/java/cc/mrbird/febs/dapp/vo/SimulateDataVo.java
index 08186b4..9a22e21 100644
--- a/src/main/java/cc/mrbird/febs/dapp/vo/SimulateDataVo.java
+++ b/src/main/java/cc/mrbird/febs/dapp/vo/SimulateDataVo.java
@@ -6,7 +6,7 @@
import java.util.List;
/**
- * @author wzy
+ * @author
* @date 2022-03-28
**/
@Data
diff --git a/src/main/java/cc/mrbird/febs/dapp/vo/WalletInfoVo.java b/src/main/java/cc/mrbird/febs/dapp/vo/WalletInfoVo.java
index 540381f..8b9601b 100644
--- a/src/main/java/cc/mrbird/febs/dapp/vo/WalletInfoVo.java
+++ b/src/main/java/cc/mrbird/febs/dapp/vo/WalletInfoVo.java
@@ -7,7 +7,7 @@
import java.math.BigDecimal;
/**
- * @author wzy
+ * @author
* @date 2022-03-18
**/
@Data
diff --git a/src/main/java/cc/mrbird/febs/job/GiveMeMoneyJob.java b/src/main/java/cc/mrbird/febs/job/GiveMeMoneyJob.java
index ba57d68..7ac81bf 100644
--- a/src/main/java/cc/mrbird/febs/job/GiveMeMoneyJob.java
+++ b/src/main/java/cc/mrbird/febs/job/GiveMeMoneyJob.java
@@ -15,7 +15,7 @@
import java.util.List;
/**
- * @author wzy
+ * @author
* @date 2021-10-20
**/
@Slf4j
diff --git a/src/main/java/cc/mrbird/febs/job/MineProfitJob.java b/src/main/java/cc/mrbird/febs/job/MineProfitJob.java
index 5ecd209..4fbe21e 100644
--- a/src/main/java/cc/mrbird/febs/job/MineProfitJob.java
+++ b/src/main/java/cc/mrbird/febs/job/MineProfitJob.java
@@ -20,7 +20,7 @@
import java.util.*;
/**
- * @author wzy
+ * @author
* @date 2022-03-28
**/
@Slf4j
@@ -114,7 +114,7 @@
return;
}
- List<DappMemberEntity> agents = dappMemberDao.selectAgentMemberList(StrUtil.split(member.getRefererIds(), ','), 5);
+ List<DappMemberEntity> agents = dappMemberDao.selectParentsList(StrUtil.split(member.getRefererIds(), ','), 5);
for (int i = 0; i < agents.size(); i++) {
DappMemberEntity agent = agents.get(i);
@@ -156,7 +156,7 @@
DappFundFlowEntity fundFlow = new DappFundFlowEntity(agent.getId(), returnMoney, 4, null, null);
dappFundFlowDao.insert(fundFlow);
- String content = "代理返利:" + returnMoney.toPlainString();
+ String content = "邀请返利:" + returnMoney.toPlainString();
DappAccountMoneyChangeEntity accountMoneyChange = new DappAccountMoneyChangeEntity(agent.getId(), walletMine.getAvailableAmount(), returnMoney, walletMine.getAvailableAmount().add(returnMoney), content, 4);
dappAccountMoneyChangeDao.insert(accountMoneyChange);
}
diff --git a/src/main/java/cc/mrbird/febs/job/NewPriceUpdateJob.java b/src/main/java/cc/mrbird/febs/job/NewPriceUpdateJob.java
index db87fae..ebd30bc 100644
--- a/src/main/java/cc/mrbird/febs/job/NewPriceUpdateJob.java
+++ b/src/main/java/cc/mrbird/febs/job/NewPriceUpdateJob.java
@@ -11,7 +11,7 @@
import javax.annotation.PostConstruct;
/**
- * @author wzy
+ * @author
* @date 2022-03-24
**/
@Slf4j
diff --git a/src/main/java/cc/mrbird/febs/modules/Test.java b/src/main/java/cc/mrbird/febs/modules/Test.java
index d5ae96c..ec1b055 100644
--- a/src/main/java/cc/mrbird/febs/modules/Test.java
+++ b/src/main/java/cc/mrbird/febs/modules/Test.java
@@ -1,7 +1,7 @@
package cc.mrbird.febs.modules;
/**
- * @author wzy
+ * @author
* @date 2020-09-23
**/
public class Test {
diff --git a/src/main/resources/mapper/dapp/DappMemberDao.xml b/src/main/resources/mapper/dapp/DappMemberDao.xml
index 8d3baac..a2b2370 100644
--- a/src/main/resources/mapper/dapp/DappMemberDao.xml
+++ b/src/main/resources/mapper/dapp/DappMemberDao.xml
@@ -53,4 +53,21 @@
limit ${size}
</if>
</select>
+
+
+ <select id="selectParentsList" resultType="cc.mrbird.febs.dapp.entity.DappMemberEntity">
+ select * from dapp_member a
+ <where>
+ 1=1
+ <if test="list != null">
+ and a.invite_id in
+ <foreach collection="list" close=")" open="(" item="item" separator=",">
+ ${item}
+ </foreach>
+ </if>
+ </where>
+ <if test="size != null">
+ limit ${size}
+ </if>
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/test/java/cc/mrbird/febs/JunitTest.java b/src/test/java/cc/mrbird/febs/JunitTest.java
index 6f7c268..96b3758 100644
--- a/src/test/java/cc/mrbird/febs/JunitTest.java
+++ b/src/test/java/cc/mrbird/febs/JunitTest.java
@@ -6,7 +6,7 @@
import org.springframework.boot.test.context.SpringBootTest;
/**
- * @author wzy
+ * @author
* @date 2022-03-28
**/
@SpringBootTest
--
Gitblit v1.9.1