From 45189f71f0eb2c119ea15de98c76839e9ee4b570 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 21 Oct 2022 18:14:48 +0800
Subject: [PATCH] 20221021

---
 src/main/java/cc/mrbird/febs/dapp/enumerate/MemberOnHookPlanEnum.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/dapp/enumerate/MemberOnHookPlanEnum.java b/src/main/java/cc/mrbird/febs/dapp/enumerate/MemberOnHookPlanEnum.java
index 938983f..cc5fb77 100644
--- a/src/main/java/cc/mrbird/febs/dapp/enumerate/MemberOnHookPlanEnum.java
+++ b/src/main/java/cc/mrbird/febs/dapp/enumerate/MemberOnHookPlanEnum.java
@@ -31,8 +31,8 @@
 
                     //当实际的收益小于预期的收益时,按照随机,否则只中奖第一方案
                     int randomInt = 1;
-                    if(profitTotal.compareTo(profitTotalNow)>0){
-                        randomInt = RandomUtil.randomInt(1, 4);
+                    if(profitTotalNow.compareTo(profitTotal)>0){
+                        randomInt = RandomUtil.randomInt(1, 3);
                     }
                     if(1 == randomInt){
                         String planKey = Integer.toString(randomInt);
@@ -63,7 +63,11 @@
                                     }
                                     BigDecimal amount = new BigDecimal(jsonObject.get("amount").toString());
                                     BigDecimal profit = amount.multiply(hangingRevenue).setScale(4, BigDecimal.ROUND_DOWN);
-                                    profitTotalNow = profitTotalNow.add(profit).setScale(4, BigDecimal.ROUND_DOWN);
+                                    if(j != randomInt){
+                                        profitTotalNow = profitTotalNow.add(profit).subtract(amount).setScale(4, BigDecimal.ROUND_DOWN);
+                                    }else{
+                                        profitTotalNow = profitTotalNow.add(profit).setScale(4, BigDecimal.ROUND_DOWN);
+                                    }
                                     jsonObject.set("profit",profit);
                                     linkedList.add(JSONUtil.toJsonStr(jsonObject));
                                     maxTimes --;

--
Gitblit v1.9.1