From 38efbb4a62ccdd98e4122fc879dd230795ef8ce3 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 19 Nov 2021 15:51:30 +0800
Subject: [PATCH] 20211119

---
 gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java b/gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java
index 10489b6..4cb50d3 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java
@@ -188,6 +188,7 @@
         stringBuffer.append(pointReward);
         redPaperRule.setStatus((short) 0);
         redPaperRule.setRuleName("分销规则");
+        redPaperRule.setRuleType("9");
         redPaperRule.setSharingProfitType("frist_reward,order_num_frist,regular_point,regular_money_percent,point_reward");
         redPaperRule.setShareRatio(stringBuffer.toString());
         redPaperRuleMapper.insert(redPaperRule);
@@ -483,6 +484,11 @@
         }
 
         RedPaperRule rule = redPaperRules.get(0);
+        if (rule.getStatus() == 0) {
+            log.info("规则被禁用, 不执行返利");
+            return;
+        }
+
         String shareTimes = getRuleValue(rule, CommonEnum.朋友圈分享限次.getValue());
 
         String shareScore = getRuleValue(rule, CommonEnum.朋友圈分享奖励.getValue());
@@ -524,7 +530,9 @@
             sysMessage.setFlag("2");
             sysMessageMapper.insert(sysMessage);
 
-            redisUtil.setex(key, times.toString(), 84400);
+            Date tomorrow = DateUtil.parse(DateUtil.tomorrow().toString("yyyy-MM-dd") + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
+            long time = DateUtil.between(new Date(), tomorrow, DateUnit.SECOND, false);
+            redisUtil.setex(key, times.toString(), (int) time);
         }
     }
 

--
Gitblit v1.9.1