用户积分查询接口

nightFragrance-admin/src/main/java/com/ylx/web/controller/point/PointActivityController.java

@@ -43,7 +43,7 @@ public class PointActivityController extends BaseController {
     @PreAuthorize("@ss.hasPermi('point:activity:list')")
     @ApiOperation("根据条件分页查询积分活动")
     @GetMapping("/page")
-    public TableDataInfo page(@Validated @RequestBody PointActivityPageDTO dto) {
+    public TableDataInfo page(PointActivityPageDTO dto) {
         startPage();
         List<PointActivityPageVo> list = this.pointActivityService.list(dto);
         return getDataTable(list);

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 String isPermanent;
+    private Integer 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 String isPermanent;
+        private Boolean isPermanent;
 
         @JsonFormat(pattern = "yyyy-MM-dd")
         @ApiModelProperty("开始时间")

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

@@ -38,15 +38,6 @@ public class PointActivityBaseVo {
     @ApiModelProperty("是否长期有效 (1:是, 0:否)")
     private String isPermanent;
 
-    @ApiModelProperty("过期策略: 1=永久有效, 2=逐笔过期(N天), 3=逐年过期(N年)")
-    private Integer expirePolicy;
-
-    @ApiModelProperty("有效期天数 (仅当 expire_policy=2 时有效)")
-    private Long expireDays;
-
-    @Excel(name = "逐年过期年份 (expire_policy=3时有效)")
-    private String expireYear;
-
     @ApiModelProperty("状态: 0=未开始, 1=进行中, 2=已结束, 3=草稿")
     private String status;
 

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

@@ -348,7 +348,7 @@ public class PointActivityServiceImpl extends ServiceImpl<PointActivityMapper, P
         }
 
         PointActivityDTO.ActivityTimeConfig timeConfig = dto.getTimeConfig();
-        if (ObjectUtil.isNull(timeConfig) || (StrUtil.equals(timeConfig.getIsPermanent(), "1") &&
+        if (ObjectUtil.isNull(timeConfig) || (!timeConfig.getIsPermanent() &&
                 (ObjectUtil.isNull(timeConfig.getStartTime()) || ObjectUtil.isNull(timeConfig.getEndTime())))) {
             throw new BaseException("活动时间配置不能为空");
         }
@@ -364,7 +364,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());
+        entity.setIsPermanent(timeConfig.getIsPermanent()? 1 : 0);
 
         // 处理状态
         if (PointActivityStatusEnum.PUBLISHED.getCode().equals(dto.getStatus())) {
@@ -482,7 +482,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());
+            entity.setIsPermanent(timeConfig.getIsPermanent()? 1 : 0);
         }
 
         // 处理状态
@@ -490,7 +490,7 @@ public class PointActivityServiceImpl extends ServiceImpl<PointActivityMapper, P
             entity.setStatus(determineActivityStatus(
                     entity.getStartTime(),
                     entity.getEndTime(),
-                    entity.getIsPermanent()
+                    timeConfig.getIsPermanent()
             ));
         }
 
@@ -589,8 +589,8 @@ public class PointActivityServiceImpl extends ServiceImpl<PointActivityMapper, P
     /**
      * 确定活动状态
      */
-    private Integer determineActivityStatus(Date startTime, Date endTime, String isPermanent) {
-        if (StrUtil.equals(isPermanent, "1")) {
+    private Integer determineActivityStatus(Date startTime, Date endTime, Boolean isPermanent) {
+        if (isPermanent) {
             return PointActivityStatusEnum.IN_PROGRESS.getCode();
         }