From 3afcc72b898f91d808ba81f9620730e4665d6890 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 11 Aug 2022 14:16:12 +0800
Subject: [PATCH] 20220810
---
src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 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 525a3fc..3b7de3a 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
@@ -6,6 +6,7 @@
import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
import cc.mrbird.febs.common.utils.AppContants;
import cc.mrbird.febs.common.utils.RedisUtils;
+import cc.mrbird.febs.mall.dto.ScorePoorDto;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
@@ -17,7 +18,9 @@
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -503,9 +506,17 @@
* 每天释放1%，给全体用户
*/
//前一天的所有消费的10%
+ DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.SCORE_POOR_RADIO.getType(), DataDictionaryEnum.SCORE_POOR_RADIO.getCode());
+ if(ObjectUtil.isEmpty(dic)){
+ return;
+ }
+ ScorePoorDto scorePoorDto = JSONUtil.toBean(dic.getValue(), ScorePoorDto.class);
+ BigDecimal everydayRatio = scorePoorDto.getEverydayRatio().multiply(new BigDecimal(0.01));
+ BigDecimal dividEquallyRatio = scorePoorDto.getDividEquallyRatio().multiply(new BigDecimal(0.01));
+
Date date = DateUtil.offsetDay(new Date(), -1);
BigDecimal totalAmount = mallOrderInfoMapper.selectTotalAmountByPayDoneAndDataString(1, date);
- BigDecimal multiplyTotalAmount = totalAmount.multiply(new BigDecimal(0.1));
+ BigDecimal multiplyTotalAmount = totalAmount.multiply(everydayRatio);
String redisKey = "scorePool";
String scorePoolRedis = redisUtils.getString(redisKey);
@@ -517,13 +528,14 @@
BigDecimal scorePoolNew = scorePoolOld.add(multiplyTotalAmount);
//每天释放1%给全体用户
- BigDecimal scorePoolToDay = scorePoolNew.multiply(new BigDecimal(0.01));
+ BigDecimal scorePoolToDay = scorePoolNew.multiply(dividEquallyRatio);
redisUtils.set(redisKey,scorePoolNew.subtract(scorePoolToDay).intValue(),0L);
QueryWrapper<MallMember> formalMember = new QueryWrapper<>();
formalMember.ne("level", AgentLevelEnum.ZERO_LEVEL.name());
List<MallMember> mallMembers = mallMemberMapper.selectList(formalMember);
+ int cnt = 0;
if(CollUtil.isNotEmpty(mallMembers)){
BigDecimal income = new BigDecimal(scorePoolToDay.divide(new BigDecimal(mallMembers.size()), 2, RoundingMode.HALF_UP).intValue());
if(income.compareTo(BigDecimal.ZERO) < 1){
@@ -536,6 +548,9 @@
*/
BigDecimal outCome = BigDecimal.ZERO;
MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(mallMember.getId());
+ if(mallMemberWallet.getScore().compareTo(BigDecimal.ZERO) < 1){
+ continue;
+ }
if(mallMemberWallet.getScore().compareTo(income) < 0){
outCome = new BigDecimal(mallMemberWallet.getScore().intValue());
}else{
@@ -545,9 +560,13 @@
walletService.reduce(outCome, mallMember.getId(), "score");
moneyFlowService.addMoneyFlow(mallMember.getId(), outCome, MoneyFlowTypeEnum.SCORE_POOL.getValue(), null, FlowTypeEnum.COMMISSION.getValue());
moneyFlowService.addMoneyFlow(mallMember.getId(), outCome.negate(), MoneyFlowTypeEnum.SCORE_POOL.getValue(), null, FlowTypeEnum.SCORE.getValue());
+ cnt ++;
}
}
- log.info("#####==积分池==end==######");
+ log.info("#####==积分池==end==######；" +
+ "今日新增积分：" + multiplyTotalAmount.setScale(2, RoundingMode.HALF_UP)
+ +"；平分积分数量："+scorePoolToDay.setScale(2, RoundingMode.HALF_UP)
+ +"；人数："+cnt);
}
}
--
Gitblit v1.9.1