From c70e92bedb031f28648a0d6e358ac7a1ecdfefea Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 31 Aug 2023 14:22:51 +0800
Subject: [PATCH] 退款查询
---
src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 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 3b7de3a..cff92e6 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
@@ -18,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.NumberUtil;
import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.RandomUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSONObject;
@@ -189,9 +191,9 @@
}
// 判断套餐或者普通商品，结算对应商品的动态分红
- if (!Objects.equals(item.getIsNormal(), isNormal)) {
- continue;
- }
+// if (!Objects.equals(item.getIsNormal(), isNormal)) {
+// continue;
+// }
// =======直推返利== start =====
// 直接奖励收益
@@ -500,6 +502,13 @@
@Override
public void scorePool() {
log.info("#####==积分池==start==######");
+
+ String redisKey = "scorePool";
+// List<MallOrderInfo> mallOrderInfos = mallOrderInfoMapper.selectList(new QueryWrapper<>());
+// if(CollUtil.isEmpty(mallOrderInfos)){
+// redisUtils.set(redisKey,0,0L);
+// return;
+// }
/**
* 后一天2点，结算前一天的所有消费
* 积分池增加每日消费的10%
@@ -517,8 +526,6 @@
Date date = DateUtil.offsetDay(new Date(), -1);
BigDecimal totalAmount = mallOrderInfoMapper.selectTotalAmountByPayDoneAndDataString(1, date);
BigDecimal multiplyTotalAmount = totalAmount.multiply(everydayRatio);
-
- String redisKey = "scorePool";
String scorePoolRedis = redisUtils.getString(redisKey);
if(StrUtil.isBlank(scorePoolRedis)){
redisUtils.set(redisKey,0,0L);
@@ -556,10 +563,12 @@
}else{
outCome = income;
}
- walletService.add(outCome, mallMember.getId(), "commission");
- 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());
+
+ outCome = new BigDecimal(RandomUtil.randomBigDecimal(BigDecimal.ZERO,outCome).intValue()).setScale(2,BigDecimal.ROUND_DOWN);
+// walletService.add(outCome, mallMember.getId(), "commission");
+// walletService.reduce(outCome, mallMember.getId(), "score");
+ moneyFlowService.addMoneyFlow(1,mallMember.getId(), outCome, MoneyFlowTypeEnum.SCORE_POOL.getValue(), null, FlowTypeEnum.COMMISSION.getValue());
+ moneyFlowService.addMoneyFlow(1,mallMember.getId(), outCome.negate(), MoneyFlowTypeEnum.SCORE_POOL.getValue(), null, FlowTypeEnum.SCORE.getValue());
cnt ++;
}
}
--
Gitblit v1.9.1