积分规则代码提交

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;
 
     /**
      * 过期策略: 1=永久有效, 2=逐笔过期(N天), 3=逐年过期(N年)

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

@@ -54,9 +54,9 @@ public class PointActivityDTO {
     @Data
     public static class ActivityTimeConfig {
 
-        @ApiModelProperty("是否长期有效")
+        @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/domain/vo/PointActivityBaseVo.java

@@ -36,7 +36,7 @@ public class PointActivityBaseVo {
     private Date endTime;
 
     @ApiModelProperty("是否长期有效 (1:是, 0:否)")
-    private Integer isPermanent;
+    private String isPermanent;
 
     @ApiModelProperty("过期策略: 1=永久有效, 2=逐笔过期(N天), 3=逐年过期(N年)")
     private Integer expirePolicy;

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

@@ -25,7 +25,7 @@ public class PointActivityStatVo {
     private String cityCode;
 
     @ApiModelProperty(name = "是否长期有效 (1:是, 0:否)")
-    private Integer isPermanent;
+    private String isPermanent;
 
     @ApiModelProperty(name = "活动开始时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

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

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ylx.common.exception.base.BaseException;
@@ -156,7 +157,9 @@ public class PointActivityServiceImpl extends ServiceImpl<PointActivityMapper, P
         // 根据dto中activityType获取全部的活动list
         LambdaQueryWrapper<PointActivity> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(PointActivity::getActivityType, dto.getActivityType());
-        List<PointActivity> activityList = pointActivityMapper.selectList(queryWrapper);
+        PointActivity pointActivity = new PointActivity();
+        pointActivity.setActivityType(dto.getActivityType());
+        List<PointActivity> activityList = pointActivityMapper.selectPointActivityList(pointActivity);
         if (CollectionUtil.isEmpty(activityList)) {
             throw new BaseException("该类型的活动不存在，设置失败");
         }
@@ -179,7 +182,7 @@ public class PointActivityServiceImpl extends ServiceImpl<PointActivityMapper, P
         }
 
         PointActivityDTO.ActivityTimeConfig timeConfig = dto.getTimeConfig();
-        if (ObjectUtil.isNull(timeConfig) || (!timeConfig.isPermanent() &&
+        if (ObjectUtil.isNull(timeConfig) || (StrUtil.equals(timeConfig.getIsPermanent(), "1") &&
                 (ObjectUtil.isNull(timeConfig.getStartTime()) || ObjectUtil.isNull(timeConfig.getEndTime())))) {
             throw new BaseException("活动时间配置不能为空");
         }
@@ -195,14 +198,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.isPermanent() ? 1 : 0);
+        entity.setIsPermanent(timeConfig.getIsPermanent());
 
         // 处理状态
         if (PointActivityStatusEnum.PUBLISHED.getCode().equals(dto.getStatus())) {
             entity.setStatus(determineActivityStatus(
                     entity.getStartTime(),
                     entity.getEndTime(),
-                    timeConfig.isPermanent()
+                    timeConfig.getIsPermanent()
             ));
         }
 
@@ -326,8 +329,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();
         }