From 785c1cae0eb5d5bbe5e37f1c59560377d49fdac3 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Wed, 23 Dec 2020 10:56:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A5=BC=E9=99=A2=E5=B0=8F=E7=BB=84=E4=B8=83?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=8B=E4=BB=B6=E6=8F=90=E4=BE=9B=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E5=85=A5=E5=8F=A3=EF=BC=8C=E5=A6=82=E6=9E=9C=E4=B8=8D=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E6=8C=87=E5=AE=9A=E8=AE=A1=E7=AE=97=E7=A7=AF=E5=88=86?=
 =?UTF-8?q?=E4=B8=8A=E9=99=90=E5=91=A8=E6=9C=9F=E7=9A=84=E4=B8=80=E5=AE=9A?=
 =?UTF-8?q?=E4=B8=8D=E8=A6=81=E4=BC=A0targetDate=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E4=BC=A0=E9=BB=98=E8=AE=A4=E6=98=AF=E5=BD=93=E5=89=8D=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/UserPointActionLogServiceImpl.java    | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java
index 61dea7998f..2b17ed82e0 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java
@@ -195,12 +195,9 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
         }
         PointRuleEntity ruleInfo = pointRuleService.getByEventCodeAndCustomerId(event.getCustomerId(),eventCode);
         if(null != ruleInfo && StringUtils.equals(NumConstant.ONE_STR,ruleInfo.getEnabledFlag())){
-            //是否使用特定的上限日期检查日
-            boolean ifPastTargetDate = StringUtils.equals(EventEnum.INVITE_RESIDENT_INTO_GROUP.getEventTag(),ruleInfo.getEventCode());
-
             Date dateCheck = null;
             Calendar calendar = Calendar.getInstance();
-            calendar.setTime(ifPastTargetDate ? event.getTargetDate() :new Date());
+            calendar.setTime(null == event.getTargetDate() ? new Date() : event.getTargetDate());
             calendar.set(Calendar.HOUR_OF_DAY, NumConstant.ZERO);
             calendar.set(Calendar.MINUTE, NumConstant.ZERO);
             calendar.set(Calendar.SECOND, NumConstant.ZERO);