From b87c5549fe471167882192944db3f2d6b729476c Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 15 Mar 2024 14:13:55 +0800
Subject: [PATCH] 抽奖

---
 src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java
index 49962a3..e035f39 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java
@@ -819,7 +819,8 @@
         for(MallScoreRecord mallScoreRecord : mallScoreRecords){
             Long memberId = mallScoreRecord.getMemberId();
             //每日释放的绿色凭证数量 = 总数 * 释放比例
-            BigDecimal scoreCnt = mallScoreRecord.getScoreCnt();
+//            BigDecimal scoreCnt = mallScoreRecord.getScoreCnt();
+            BigDecimal scoreCnt = mallScoreRecord.getSurplusCnt();
             BigDecimal scoreReleaseCnt = scoreCnt.multiply(roleReleasePercent).setScale(2,BigDecimal.ROUND_DOWN);
 
             BigDecimal surplusCnt = mallScoreRecord.getSurplusCnt();
@@ -899,8 +900,8 @@
 
         /**
          * 20%给合伙人、联创
-         *  5% 给联创
-         *  15% 给合伙人
+         *  5% 给联创 10%
+         *  15% 给合伙人 10%
          */
         DataDictionaryCustom roleAchievePercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                 GreenScoreEnum.ROLE_ACHIEVE_PERCENT.getType(),
@@ -914,7 +915,8 @@
         List<MallMember> roleAchieveReleaseMembers = mallMemberMapper.selectByRole(3,1);
         if(CollUtil.isNotEmpty(roleAchieveReleaseMembers)){
             //联创拿走0.25
-            BigDecimal multiply = roleAchieveRelease.multiply(new BigDecimal(0.25));
+//            BigDecimal multiply = roleAchieveRelease.multiply(new BigDecimal(0.25));
+            BigDecimal multiply = roleAchieveRelease.multiply(new BigDecimal(0.5));
             BigDecimal memberAchieveRelease = multiply.divide(new BigDecimal(roleAchieveReleaseMembers.size()), 2, BigDecimal.ROUND_DOWN);
             if(memberAchieveRelease.compareTo(BigDecimal.ZERO) > 0){
                 for(MallMember mallMember : roleAchieveReleaseMembers){
@@ -930,7 +932,8 @@
         List<MallMember> roleAchieveReleaseHHR = mallMemberMapper.selectByRole(4,1);
         if(CollUtil.isNotEmpty(roleAchieveReleaseHHR)){
             //合伙人拿走0.75
-            BigDecimal multiply = roleAchieveRelease.multiply(new BigDecimal(0.75));
+//            BigDecimal multiply = roleAchieveRelease.multiply(new BigDecimal(0.75));
+            BigDecimal multiply = roleAchieveRelease.multiply(new BigDecimal(0.5));
             BigDecimal memberAchieveReleaseHHR = multiply.divide(new BigDecimal(roleAchieveReleaseHHR.size()), 2, BigDecimal.ROUND_DOWN);
             if(memberAchieveReleaseHHR.compareTo(BigDecimal.ZERO) > 0){
                 for(MallMember mallMember : roleAchieveReleaseHHR){

--
Gitblit v1.9.1