积分活动添加时间校验和代码调整

nightFragrance-massage/src/main/java/com/ylx/point/service/impl/PointActivityServiceImpl.java

@@ -542,7 +542,7 @@ public class PointActivityServiceImpl extends ServiceImpl<PointActivityMapper, P
         }
 
         PointActivityDTO.ActivityTimeConfig timeConfig = dto.getTimeConfig();
-        if (ObjectUtil.isNull(timeConfig) || (StrUtil.isNotEmpty(timeConfig.getIsPermanent()) &&
+        if (ObjectUtil.isNull(timeConfig) || (StrUtil.equals(timeConfig.getIsPermanent(), "0") &&
                 (ObjectUtil.isNull(timeConfig.getStartTime()) || ObjectUtil.isNull(timeConfig.getEndTime())))) {
             throw new ServiceException("活动时间配置不能为空");
         }
@@ -556,9 +556,14 @@ public class PointActivityServiceImpl extends ServiceImpl<PointActivityMapper, P
 
         // 处理时间配置
         PointActivityDTO.ActivityTimeConfig timeConfig = dto.getTimeConfig();
-        entity.setStartTime(DateUtil.beginOfDay(timeConfig.getStartTime()));
-        entity.setEndTime(processEndTime(timeConfig.getEndTime()));
         entity.setIsPermanent(timeConfig.getIsPermanent());
+        // 添加对活动时间的校验
+        if (ObjectUtil.isNotEmpty(timeConfig.getStartTime())) {
+            entity.setStartTime(DateUtil.beginOfDay(timeConfig.getStartTime()));
+        }
+        if (ObjectUtil.isNotEmpty(timeConfig.getEndTime())) {
+            entity.setEndTime(processEndTime(timeConfig.getEndTime()));
+        }
 
         // 处理状态
         if (PointActivityStatusEnum.PUBLISHED.getCode().equals(dto.getStatus())) {