|
|
@ -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); |
|
|
|