From 526c6c73ffba70b271ff20732d5f84cd0f410834 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 10 Nov 2022 17:07:34 +0800
Subject: [PATCH] 20221021
---
src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java | 3 +++
src/main/resources/mapper/dapp/DappMemberDao.xml | 2 +-
src/main/resources/mapper/dapp/IgtOnHookPlanOrderItemDao.xml | 3 +--
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 4 ++--
src/main/java/cc/mrbird/febs/dapp/mapper/IgtOnHookPlanOrderItemDao.java | 2 +-
src/main/resources/mapper/dapp/DappWalletCoinDao.xml | 1 +
6 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/mapper/IgtOnHookPlanOrderItemDao.java b/src/main/java/cc/mrbird/febs/dapp/mapper/IgtOnHookPlanOrderItemDao.java
index 47ecfa8..91f069f 100644
--- a/src/main/java/cc/mrbird/febs/dapp/mapper/IgtOnHookPlanOrderItemDao.java
+++ b/src/main/java/cc/mrbird/febs/dapp/mapper/IgtOnHookPlanOrderItemDao.java
@@ -21,7 +21,7 @@
IgtOnHookPlanOrderItem selectByMemberIdAndBelongNum( @Param("memberId")Long memberId, @Param("recordNum")String recordNum);
BigDecimal selectTotalProfitByMemberIdAndStateAndIsgoal(@Param("memberId")Long memberId
- , @Param("state")int i, @Param("isGoal")int isGoal);
+ , @Param("state")int i);
List<IgtOnHookPlanOrderItem> selectByIgtIdAndMemberId(@Param("orderId") Long orderId, @Param("memberId")Long memberId);
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 39a60db..8b153ab 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
@@ -597,7 +597,7 @@
* 否则，计算收益占本金的比例。符合条件允许提现
*/
//获取用户的总收益
- BigDecimal totalProfitOut = igtOnHookPlanOrderItemdao.selectTotalProfitByMemberIdAndStateAndIsgoal(memberIdOut,1,2);
+ BigDecimal totalProfitOut = igtOnHookPlanOrderItemdao.selectTotalProfitByMemberIdAndStateAndIsgoal(memberIdOut,2);
if(balance.compareTo(totalProfitOut) > 0){
BigDecimal totalAmount = dappWalletCoinEntityOut.getTotalAmount();
//用户总收益率
@@ -707,7 +707,7 @@
* 否则，计算收益占本金的比例。符合条件允许提现
*/
//获取用户的总收益
- BigDecimal totalProfit = igtOnHookPlanOrderItemdao.selectTotalProfitByMemberIdAndStateAndIsgoal(memberId,1,2);
+ BigDecimal totalProfit = igtOnHookPlanOrderItemdao.selectTotalProfitByMemberIdAndStateAndIsgoal(memberId,2);
if(balance.compareTo(totalProfit) >= 0){
BigDecimal totalAmount = dappWalletCoinEntity.getTotalAmount();
//用户总收益率
diff --git a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java b/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
index 518f19c..80db3f8 100644
--- a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
+++ b/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
@@ -441,6 +441,9 @@
List<DappMemberEntity> dappMemberEntitiesNext = new ArrayList<>();
if(CollUtil.isNotEmpty(dappMemberEntities)){
for(DappMemberEntity dappMemberEntity : dappMemberEntities){
+ if(ObjectUtil.isEmpty(dappMemberEntity)){
+ continue;
+ }
Long memberEntityId = dappMemberEntity.getId();
String refererId = dappMemberEntity.getRefererId();
String inviteId = dappMemberEntity.getInviteId();
diff --git a/src/main/resources/mapper/dapp/DappMemberDao.xml b/src/main/resources/mapper/dapp/DappMemberDao.xml
index aff934c..7f74145 100644
--- a/src/main/resources/mapper/dapp/DappMemberDao.xml
+++ b/src/main/resources/mapper/dapp/DappMemberDao.xml
@@ -238,7 +238,7 @@
inner join dapp_member b on a.member_id = b.id
where
a.total_amount <![CDATA[ >= ]]> 51
- and b.referer_id = #{inviteId}
+ and find_in_set(#{inviteId}, b.referer_ids)
and b.identity = #{identity}
</select>
diff --git a/src/main/resources/mapper/dapp/DappWalletCoinDao.xml b/src/main/resources/mapper/dapp/DappWalletCoinDao.xml
index 52265fa..0c9114f 100644
--- a/src/main/resources/mapper/dapp/DappWalletCoinDao.xml
+++ b/src/main/resources/mapper/dapp/DappWalletCoinDao.xml
@@ -121,6 +121,7 @@
dapp_wallet_coin a
inner join dapp_member b on a.member_id = b.id
where a.total_amount <![CDATA[ >= ]]> 51
+and b.identity != 'LEVEL_TM'
</select>
<update id="addTotalAndaddAvailableByMemberId">
diff --git a/src/main/resources/mapper/dapp/IgtOnHookPlanOrderItemDao.xml b/src/main/resources/mapper/dapp/IgtOnHookPlanOrderItemDao.xml
index 145c095..1076fef 100644
--- a/src/main/resources/mapper/dapp/IgtOnHookPlanOrderItemDao.xml
+++ b/src/main/resources/mapper/dapp/IgtOnHookPlanOrderItemDao.xml
@@ -46,9 +46,8 @@
<select id="selectTotalProfitByMemberIdAndStateAndIsgoal" resultType="java.math.BigDecimal">
SELECT
ifnull(sum(a.profit),0)
- FROM igt_on_hook_plan_order_item a
+ FROM igt_on_hook_plan_order a
where a.member_id = #{memberId}
- and a.is_goal = #{isGoal}
and a.state = #{state}
</select>
--
Gitblit v1.9.1