From ef4ad171c46f615a5b719bac70c468b561bc08ac Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 08 Dec 2021 11:22:43 +0800
Subject: [PATCH] Merge branch 'score-shop' into xc-prd
---
gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java | 5 ++++-
1 files changed, 4 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 e435b8d..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);
@@ -529,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