|
@@ -867,7 +867,9 @@ DISCOUNT("畅学卡")
|
|
|
|
|
|
private void checkActivity(UserPaymentOrderWrapper.UserPaymentOrder orderReq) {
|
|
private void checkActivity(UserPaymentOrderWrapper.UserPaymentOrder orderReq) {
|
|
ActivityPlanVo activityPlan = activityPlanService.detail(orderReq.getActivityId());
|
|
ActivityPlanVo activityPlan = activityPlanService.detail(orderReq.getActivityId());
|
|
- if (activityPlan != null && activityPlan.getActivityState() == 1) {
|
|
|
|
|
|
+ Date now = new Date();
|
|
|
|
+ if (activityPlan != null && activityPlan.getActivityState() == 1
|
|
|
|
+ && activityPlan.getActivityStart().before(now) && activityPlan.getActivityEnd().after(now)) {
|
|
if (ActivityTypeEnum.MEMBER == activityPlan.getActivityType()) {
|
|
if (ActivityTypeEnum.MEMBER == activityPlan.getActivityType()) {
|
|
|
|
|
|
checkActivityTimes(orderReq.getUserId(),orderReq.getPaymentClient(), activityPlan.getId());
|
|
checkActivityTimes(orderReq.getUserId(),orderReq.getPaymentClient(), activityPlan.getId());
|