|
@@ -129,11 +129,14 @@ public class MarketingServiceImpl extends ServiceImpl<MarketingMapper, Marketing
|
|
|
throw new ServiceException("营销活动不存在");
|
|
|
}
|
|
|
|
|
|
- Date now = DateUtils.getNowDate();
|
|
|
- if (MarketingStatusEnum.CLOSE.getValue().equals(marketing.getIsOn()) || now.after(marketing.getEndTime())) {
|
|
|
+ if (MarketingStatusEnum.CLOSE.getValue().equals(marketing.getIsOn())) {
|
|
|
throw new ServiceException("活动当前状态不支持修改");
|
|
|
}
|
|
|
|
|
|
+ Date now = DateUtils.getNowDate();
|
|
|
+ if (MarketingStatusEnum.ON.getValue().equals(marketing.getIsOn()) && now.after(marketing.getEndTime())) {
|
|
|
+ throw new ServiceException("活动当前状态不支持修改");
|
|
|
+ }
|
|
|
|
|
|
// 更新营销活动
|
|
|
BeanUtils.copyProperties(marketingUpdateParam, marketing);
|