From 92549e37577a6e5d3831e55426d9deb6f10814b0 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 01 Nov 2022 10:47:14 +0800
Subject: [PATCH] 20221021
---
src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java | 29 ++++++++++++-----------------
1 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java b/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
index 4c1ade5..9ad8283 100644
--- a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
+++ b/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
@@ -226,7 +226,7 @@
// igtOnHookPlanOrder.setState(3);
// igtOnHookPlanOrderDao.updateById(igtOnHookPlanOrder);
// }else{
-// //获取收益率
+ //获取收益率
// DappMemberEntity dappMemberEntity = dappMemberDao.selectById(igtOnHookPlanOrder.getMemberId());
// DataDictionaryCustom identityDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.LEVEL_MB.getType(), dappMemberEntity.getIdentity());
// String identityDicValue = identityDic.getValue();
@@ -282,15 +282,19 @@
List<IgtOnHookPlanOrder> igtOnHookPlanOrders = igtOnHookPlanOrderDao.selectByState(3);
if(CollUtil.isNotEmpty(igtOnHookPlanOrders)){
for(IgtOnHookPlanOrder igtOnHookPlanOrder : igtOnHookPlanOrders){
- Long orderId = igtOnHookPlanOrder.getId();
Long memberId = igtOnHookPlanOrder.getMemberId();
BigDecimal planAmount = igtOnHookPlanOrder.getPlanAmount();
- BigDecimal avaAmount = igtOnHookPlanOrder.getAvaAmount();
- //总盈利
-// BigDecimal totalProfit = igtOnHookPlanOrderItemDao.selectTotalProfitByByOrderIdAndMemberIdAndState(orderId,memberId,1,2);
- BigDecimal totalProfit = igtOnHookPlanOrder.getProfit();
DappMemberEntity dappMemberEntity = dappMemberDao.selectById(memberId);
+ //获取收益率
+ DataDictionaryCustom identityDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.LEVEL_MB.getType(), dappMemberEntity.getIdentity());
+ String identityDicValue = identityDic.getValue();
+ JSONObject identityDicValueParse = JSONUtil.parseObj(identityDicValue);
+ BigDecimal hangingRevenueLevel = new BigDecimal(identityDicValueParse.get("hangingRevenue").toString())
+ .multiply(new BigDecimal(0.01)).setScale(4,BigDecimal.ROUND_DOWN);
+ //获取收益
+ BigDecimal totalProfit = planAmount.multiply(hangingRevenueLevel).setScale(4,BigDecimal.ROUND_DOWN);
+
String refererIds = dappMemberEntity.getRefererIds();
List<String> refererIdList = StrUtil.split(refererIds, ",", -1, true, true);
//生成流水佣金和盈利分成和流水记录，返回剩余盈利
@@ -299,19 +303,10 @@
BigDecimal systemTotal = dappWalletService.updatePTFC(memberId,totalProfit);
totalProfit = totalProfit.subtract(profitSharingTotal).subtract(systemTotal);
-
- //获取用户信息的是否盈利字段
- DappMemberEntity dappMember = dappMemberDao.selectById(memberId);
- Integer isProfit = dappMember.getIsProfit() == null ? 1 : dappMember.getIsProfit();
-
igtOnHookPlanOrder.setState(2);
//一次挂机剩余的全部金额
- BigDecimal totalMoney = totalProfit.add(avaAmount);
- if(totalMoney.compareTo(planAmount)<=0){
- igtOnHookPlanOrder.setProfitState(2);
- }else{
- igtOnHookPlanOrder.setProfitState(1);
- }
+ BigDecimal totalMoney = totalProfit.add(planAmount);
+
igtOnHookPlanOrder.setProfit(totalProfit);
igtOnHookPlanOrderDao.updateById(igtOnHookPlanOrder);
dappMemberEntity.setIsOnHook(3);
--
Gitblit v1.9.1