From 0cf8bb430ba18e2ab47ca40ce0d4e160d62e5b52 Mon Sep 17 00:00:00 2001 From: duhui Date: Fri, 10 Dec 2021 00:29:26 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=9E=E7=BB=AD=E7=A4=BC=E5=8C=85=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activity/ContinuousGiftActivity.java | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ContinuousGiftActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ContinuousGiftActivity.java index 1ee84bac6..21551a354 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ContinuousGiftActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ContinuousGiftActivity.java @@ -125,9 +125,9 @@ public class ContinuousGiftActivity extends AbstractActivity { result = 8; }else { // 未购买, 是否解锁 - if (days >= theme.getUnlockDay()){ + if (judgeDays(days,theme.getUnlockDay(),theme.getType())){ // 已解锁, 可买天数 - if (days >= theme.getBuyDay()){ + if (judgeDays(days,theme.getBuyDay(),theme.getType())){ // 可买, 是否购买前置礼包 if (checkBuyAgo(user,theme.getId())){ // 可买 @@ -142,9 +142,9 @@ public class ContinuousGiftActivity extends AbstractActivity { } }else { // 未解锁, 是否可见 - if (days >= theme.getVisibleDay()){ + if (judgeDays(days,theme.getVisibleDay(),theme.getType())){ // 可见, 是否可预览 - result = days >= theme.getViewDay()?6:7; + result = judgeDays(days,theme.getViewDay(),theme.getType())?6:7; }else { // 不可见 result = 5; @@ -156,6 +156,19 @@ public class ContinuousGiftActivity extends AbstractActivity { return result; } + /** + * 判断天数 + * @param condition + * @param value + * @param type + * @return + */ + private boolean judgeDays(int value,int condition,int type){ + if (type == 2){ + return value == condition; + } + return value >= condition; + } @Override public List getAllMissInfo(User user,ActivityMission activityMission, Set filter) {