解决接口报错问题

nightFragrance-massage/src/main/java/com/ylx/point/domain/PointActivity.java

@@ -66,7 +66,7 @@ public class PointActivity extends BaseEntity {
      * 是否长期有效 (1:是, 0:否)
      */
     @Excel(name = "是否长期有效 (1:是, 0:否)")
-    private Integer isPermanent;
+    private String isPermanent;
 
     /**
      * 过期策略id

nightFragrance-massage/src/main/java/com/ylx/point/domain/dto/PointActivityDTO.java

@@ -56,7 +56,7 @@ public class PointActivityDTO {
 
         @ApiModelProperty("是否长期有效 (1:是, 0:否)")
         @JsonProperty(value = "isPermanent")
-        private Boolean isPermanent;
+        private String isPermanent;
 
         @JsonFormat(pattern = "yyyy-MM-dd")
         @ApiModelProperty("开始时间")

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

@@ -2,7 +2,6 @@ package com.ylx.point.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -12,7 +11,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ylx.common.core.domain.model.WxLoginUser;
 import com.ylx.common.exception.ServiceException;
-import com.ylx.common.exception.base.BaseException;
 import com.ylx.common.utils.DateUtils;
 import com.ylx.common.utils.SecurityUtils;
 import com.ylx.point.domain.*;
@@ -547,7 +545,7 @@ public class PointActivityServiceImpl extends ServiceImpl<PointActivityMapper, P
         }
 
         PointActivityDTO.ActivityTimeConfig timeConfig = dto.getTimeConfig();
-        if (ObjectUtil.isNull(timeConfig) || (!timeConfig.getIsPermanent() &&
+        if (ObjectUtil.isNull(timeConfig) || (StrUtil.isNotEmpty(timeConfig.getIsPermanent()) &&
                 (ObjectUtil.isNull(timeConfig.getStartTime()) || ObjectUtil.isNull(timeConfig.getEndTime())))) {
             throw new ServiceException("活动时间配置不能为空");
         }
@@ -563,7 +561,7 @@ 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() ? 1 : 0);
+        entity.setIsPermanent(timeConfig.getIsPermanent());
 
         // 处理状态
         if (PointActivityStatusEnum.PUBLISHED.getCode().equals(dto.getStatus())) {
@@ -681,7 +679,7 @@ public class PointActivityServiceImpl extends ServiceImpl<PointActivityMapper, P
         if (timeConfig != null) {
             entity.setStartTime(DateUtil.beginOfDay(timeConfig.getStartTime()));
             entity.setEndTime(processEndTime(timeConfig.getEndTime()));
-            entity.setIsPermanent(timeConfig.getIsPermanent() ? 1 : 0);
+            entity.setIsPermanent(timeConfig.getIsPermanent());
         }
 
         // 处理状态
@@ -788,8 +786,8 @@ public class PointActivityServiceImpl extends ServiceImpl<PointActivityMapper, P
     /**
      * 确定活动状态
      */
-    private Integer determineActivityStatus(Date startTime, Date endTime, Boolean isPermanent) {
-        if (isPermanent) {
+    private Integer determineActivityStatus(Date startTime, Date endTime, String isPermanent) {
+        if (StrUtil.equals(isPermanent, "1")) {
             return PointActivityStatusEnum.IN_PROGRESS.getCode();
         }