|
|
|
@@ -158,13 +158,13 @@ public class WxActivityServiceImpl implements WxActivityService { |
|
|
|
if (activity == null) { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); |
|
|
|
} |
|
|
|
if (wxActivity.getStatus().equals(EnumActivityStatus.INJECT_ONLINE.getCode())){ |
|
|
|
if(wxActivity.getActivityType().equals(EnumDelFlag.YES.getCode())){ |
|
|
|
if (wxActivity.getEndTime().before(new Date())) { |
|
|
|
if (activity.getStatus().equals(EnumActivityStatus.INJECT_ONLINE.getCode())){ |
|
|
|
if(activity.getActivityType().equals(EnumDelFlag.YES.getCode())){ |
|
|
|
if (activity.getEndTime().before(new Date())) { |
|
|
|
throw new MallinkException(ErrorCode.ACTIVITY_JOIN_TIME_END); |
|
|
|
} |
|
|
|
}else if(wxActivity.getActivityType().equals(EnumDelFlag.NO.getCode())){ |
|
|
|
if (wxActivity.getActivityEndTime().before(new Date())) { |
|
|
|
}else if(activity.getActivityType().equals(EnumDelFlag.NO.getCode())){ |
|
|
|
if (activity.getActivityEndTime().before(new Date())) { |
|
|
|
throw new MallinkException(ErrorCode.ACTIVITY_TIME_END); |
|
|
|
} |
|
|
|
}else{ |
|
|
|
|