From 3c2f5887bf0f2386d5bcbbe4260ef650d166b202 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 21 Apr 2021 15:57:28 +0800
Subject: [PATCH] 20210421 签到
---
zq-erp/src/main/java/com/matrix/system/activity/service/ActivitySignWriteoffService.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/activity/service/ActivitySignWriteoffService.java b/zq-erp/src/main/java/com/matrix/system/activity/service/ActivitySignWriteoffService.java
index 61bc0f2..ebd77b1 100644
--- a/zq-erp/src/main/java/com/matrix/system/activity/service/ActivitySignWriteoffService.java
+++ b/zq-erp/src/main/java/com/matrix/system/activity/service/ActivitySignWriteoffService.java
@@ -163,7 +163,8 @@
//线下兑换失效
Long awardId = activitySignWriteoff.getAwardId();
ActivitySignAwardSet activitySignAwardSet = activitySignAwardSetDao.selectById(awardId);
- if(ActivitySignAwardSet.AWARDWAY_ONE == activitySignAwardSet.getAwardWay()){
+ if(ActivitySignAwardSet.AWARDWAY_ONE == activitySignAwardSet.getAwardWay()
+ || ActivitySignAwardSet.AWARDWAY_THREE == activitySignAwardSet.getAwardWay()){
Date prizeStartTime = activitySignAwardSet.getPrizeStartTime();
if(DateUtil.date().getTime() < prizeStartTime.getTime()){
return new AjaxResult(AjaxResult.STATUS_FAIL, "兑奖还没开始呢！");
--
Gitblit v1.9.1