From 1fc5510367dcf321ac85e50e31c9dcdaaf5cd09e Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 21 Dec 2022 11:56:27 +0800
Subject: [PATCH] 20221221

---
 src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java |   15 ++++++++++-----
 1 files changed, 10 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 3b7de3a..b40eef9 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
@@ -189,9 +189,9 @@
             }
 
             // 判断套餐或者普通商品,结算对应商品的动态分红
-            if (!Objects.equals(item.getIsNormal(), isNormal)) {
-                continue;
-            }
+//            if (!Objects.equals(item.getIsNormal(), isNormal)) {
+//                continue;
+//            }
 
             // =======直推返利== start =====
             // 直接奖励收益
@@ -500,6 +500,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 +524,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);

--
Gitblit v1.9.1