Merge remote-tracking branch 'origin/point_dev' into point_dev

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

@@ -1,11 +1,11 @@
 package com.ylx.web.controller.point;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ylx.common.annotation.Log;
 import com.ylx.common.core.controller.BaseController;
+import com.ylx.common.core.domain.AjaxResult;
 import com.ylx.common.core.domain.R;
+import com.ylx.common.core.page.TableDataInfo;
 import com.ylx.common.enums.BusinessType;
-import com.ylx.point.domain.PointActivity;
 import com.ylx.point.domain.dto.PointActivityDTO;
 import com.ylx.point.domain.dto.PointActivityPageDTO;
 import com.ylx.point.domain.dto.PointActivityValidityDTO;
@@ -13,11 +13,15 @@ import com.ylx.point.domain.vo.PointActivityDetailsVo;
 import com.ylx.point.domain.vo.PointActivityPageVo;
 import com.ylx.point.domain.vo.PointActivityStatVo;
 import com.ylx.point.service.IPointActivityService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * 积分活动主Controller
  *
@@ -26,6 +30,7 @@ import org.springframework.web.bind.annotation.*;
  */
 @RestController
 @RequestMapping("/point/activity")
+@Api(tags = {"积分规则配置"})
 public class PointActivityController extends BaseController {
 
     @Autowired
@@ -37,9 +42,10 @@ public class PointActivityController extends BaseController {
     @PreAuthorize("@ss.hasPermi('point:activity:list')")
     @ApiOperation("根据条件分页查询积分活动")
     @GetMapping("/page")
-    public R<Page<PointActivityPageVo>> page(Page<PointActivity> page, PointActivityPageDTO dto) {
-        Page<PointActivityPageVo> pageResult = this.pointActivityService.page(page, dto);
-        return R.ok(pageResult);
+    public TableDataInfo page(PointActivityPageDTO dto) {
+        startPage();
+        List<PointActivityPageVo> list = this.pointActivityService.list(dto);
+        return getDataTable(list);
     }
 
     /**
@@ -60,9 +66,9 @@ public class PointActivityController extends BaseController {
     @ApiOperation("新增积分活动")
     @Log(title = "积分活动添加", businessType = BusinessType.INSERT)
     @PostMapping
-    public R add(@RequestBody PointActivityDTO dto) {
+    public AjaxResult add(@Validated @RequestBody PointActivityDTO dto) {
         this.pointActivityService.add(dto);
-        return R.ok();
+        return success();
     }
 
     /**
@@ -72,9 +78,9 @@ public class PointActivityController extends BaseController {
     @ApiOperation("编辑积分活动")
     @Log(title = "积分活动编辑", businessType = BusinessType.UPDATE)
     @PutMapping
-    public R edit(@RequestBody PointActivityDTO dto) {
+    public AjaxResult edit(@Validated @RequestBody PointActivityDTO dto) {
         this.pointActivityService.edit(dto);
-        return R.ok();
+        return success();
     }
 
     /**
@@ -83,9 +89,9 @@ public class PointActivityController extends BaseController {
     @PreAuthorize("@ss.hasPermi('point:activity:query')")
     @ApiOperation("根据id获取积分活动统计数据")
     @GetMapping(value = "/stat/{id}")
-    public R<PointActivityStatVo> getStatInfo(@PathVariable("id") String id) {
+    public AjaxResult getStatInfo(@PathVariable("id") String id) {
         PointActivityStatVo vo = this.pointActivityService.getStatInfo(id);
-        return R.ok(vo);
+        return success(vo);
     }
 
     /**
@@ -95,9 +101,9 @@ public class PointActivityController extends BaseController {
     @ApiOperation("编辑积分活动时效")
     @Log(title = "积分活动时效编辑", businessType = BusinessType.UPDATE)
     @PutMapping(value = "/validity")
-    public R editValidity(@RequestBody PointActivityValidityDTO dto) {
+    public AjaxResult editValidity(@Validated @RequestBody PointActivityValidityDTO dto) {
         this.pointActivityService.editValidity(dto);
-        return R.ok();
+        return success();
     }
 
 }

nightFragrance-common/src/main/java/com/ylx/common/annotation/EnumTranslate.java

@@ -0,0 +1,27 @@
+package com.ylx.common.annotation;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Target({FIELD})
+@Retention(RUNTIME)
+public @interface EnumTranslate {
+
+    /**
+     * 枚举类
+     */
+    Class<? extends Enum<?>> enumClass();
+
+    /**
+     * 枚举中获取code的方法名
+     */
+    String codeMethod() default "getCode";
+
+    /**
+     * 枚举中获取描述的方法名
+     */
+    String descMethod() default "getInfo";
+}

nightFragrance-common/src/main/java/com/ylx/common/aspect/EnumTranslateAspect.java

@@ -0,0 +1,119 @@
+package com.ylx.common.aspect;
+
+import com.ylx.common.annotation.EnumTranslate;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.Collection;
+
+@Aspect
+@Component
+@Order(Ordered.HIGHEST_PRECEDENCE + 1)
+public class EnumTranslateAspect {
+
+    // 【改成你自己的 controller 包路径】
+    @Pointcut("execution(public * com.ylx.web.controller..*.*(..))")
+    public void pointcut() {}
+
+    @Around("pointcut()")
+    public Object around(ProceedingJoinPoint point) throws Throwable {
+        Object result = point.proceed();
+        if (result == null) return null;
+
+        // 全局翻译：支持 单个对象 / List / 分页对象
+        translate(result);
+        return result;
+    }
+
+    // ==========================================
+    // 核心方法：递归翻译所有类型
+    // ==========================================
+    private void translate(Object obj) {
+        if (obj == null) return;
+
+        // 1. 集合 List Set
+        if (obj instanceof Collection) {
+            ((Collection<?>) obj).forEach(this::translate);
+            return;
+        }
+
+        // 2. 分页对象（这里是关键！自动提取分页里的 rows）
+        Class<?> clazz = obj.getClass();
+        try {
+            // 通用分页字段：rows / list / data 三个都兼容
+            for (String fieldName : Arrays.asList("rows", "list", "data")) {
+                Field listField = clazz.getDeclaredField(fieldName);
+                listField.setAccessible(true);
+                Object listObj = listField.get(obj);
+                if (listObj instanceof Collection) {
+                    translate(listObj);
+                }
+            }
+        } catch (NoSuchFieldException ignored) {
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        // 3. 翻译当前对象自身的字段
+        translateFields(obj);
+    }
+
+    // ==========================================
+    // 翻译单个对象的枚举字段
+    // ==========================================
+    private void translateFields(Object obj) {
+        Field[] fields = obj.getClass().getDeclaredFields();
+        for (Field field : fields) {
+            EnumTranslate anno = field.getAnnotation(EnumTranslate.class);
+            if (anno == null) continue;
+
+            try {
+                field.setAccessible(true);
+                Object code = field.get(obj);
+                if (code == null) continue;
+
+                // 拿到枚举描述
+                String desc = getEnumDesc(
+                        anno.enumClass(),
+                        code,
+                        anno.codeMethod(),
+                        anno.descMethod()
+                );
+
+                // 自动赋值给 statusDesc
+                Field descField = obj.getClass().getDeclaredField(field.getName() + "Desc");
+                descField.setAccessible(true);
+                descField.set(obj, desc);
+            } catch (NoSuchFieldException ignored) {
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    // ==========================================
+    // 根据code获取枚举描述
+    // ==========================================
+    private String getEnumDesc(Class<? extends Enum<?>> enumClass, Object code, String codeMethod, String descMethod) {
+        try {
+            Method getCode = enumClass.getMethod(codeMethod);
+            Method getDesc = enumClass.getMethod(descMethod);
+
+            for (Enum<?> e : enumClass.getEnumConstants()) {
+                Object enumCode = getCode.invoke(e);
+                if (enumCode.equals(code)) {
+                    return String.valueOf(getDesc.invoke(e));
+                }
+            }
+        } catch (Exception ignored) {}
+        return "";
+    }
+}

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

@@ -90,7 +90,7 @@ public class PointActivity extends BaseEntity {
      * 状态: 0=未开始, 1=进行中, 2=已结束, 3=草稿
      */
     @Excel(name = "状态: 0=未开始, 1=进行中, 2=已结束, 3=草稿")
-    private Long status;
+    private Integer status;
 
     /**
      * 前端展示排序

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

@@ -83,4 +83,10 @@ public class PointActivityTask extends BaseEntity {
     @Excel(name = "逻辑删除")
     private Integer isDeleted;
 
+    /**
+     * 状态: 0=启用, 1=弃用
+     */
+    @Excel(name = "状态: 0=启用, 1=弃用")
+    private Integer status;
+
 }

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

@@ -48,6 +48,7 @@ public class PointActivityDTO {
     private PointSignTaskDTO signTaskDTO;
 
     @ApiModelProperty("状态：草稿=3, 发布=4")
+    @NotNull(message = "状态不能为空")
     private Integer status;
 
     @Data

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

@@ -1,12 +1,13 @@
 package com.ylx.point.domain.dto;
 
+import com.ylx.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 @ApiModel("积分活动分页查询请求DTO")
-public class PointActivityPageDTO {
+public class PointActivityPageDTO extends BaseEntity {
 
     @ApiModelProperty("活动类型")
     private Integer activityType;
@@ -15,7 +16,7 @@ public class PointActivityPageDTO {
     private String cityCode;
 
     @ApiModelProperty("状态")
-    private Long status;
+    private Integer status;
 
     @ApiModelProperty("活动开始时间")
     private String startTime;

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

@@ -32,4 +32,7 @@ public class PointActivityTaskDTO {
     @ApiModelProperty("限制类型值dict_value")
     private String frequencyLimitValue;
 
+    @ApiModelProperty("状态")
+    private Integer status;
+
 }

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

@@ -22,7 +22,7 @@ public class PointActivityBaseVo {
     private String description;
 
     @ApiModelProperty("活动类型")
-    private Integer activityType;
+    private String activityType;
 
     @ApiModelProperty("覆盖城市代码")
     private String cityCode;
@@ -48,6 +48,6 @@ public class PointActivityBaseVo {
     private String expireYear;
 
     @ApiModelProperty("状态: 0=未开始, 1=进行中, 2=已结束, 3=草稿")
-    private Long status;
+    private String status;
 
 }

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

@@ -1,14 +1,17 @@
 package com.ylx.point.domain.vo;
 
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 @ApiModel("活动详情vo")
 public class PointActivityDetailsVo<T extends PointActivityBaseVo> {
 
+    @ApiModelProperty("活动类型")
     private Integer activityType;
 
+    @ApiModelProperty("活动详情")
     private T detail; // 自动适配不同VO
 
     public static <T extends PointActivityBaseVo> PointActivityDetailsVo<T> of(Integer activityType, T detail) {

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

@@ -2,6 +2,9 @@ package com.ylx.point.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.ylx.common.annotation.EnumTranslate;
+import com.ylx.point.enums.PointActivityStatusEnum;
+import com.ylx.point.enums.PointActivityTypeEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -18,18 +21,12 @@ public class PointActivityPageVo {
     @ApiModelProperty(name = "活动名称")
     private String name;
 
-    @JsonIgnore
-    private Integer activityType;
-
     @ApiModelProperty(name = "活动类型")
-    private Integer activityTypeName;
+    private String activityType;
 
-    @JsonIgnore
+    @ApiModelProperty(name = "覆盖城市")
     private String cityCode;
 
-    @ApiModelProperty(name = "覆盖城市名称")
-    private String cityName;
-
     @ApiModelProperty(name = "活动开始时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime startTime;
@@ -41,10 +38,7 @@ public class PointActivityPageVo {
     @ApiModelProperty(name = "是否长期有效 (1:是, 0:否)")
     private Integer isPermanent;
 
-    @JsonIgnore
-    private Long status;
-
     @ApiModelProperty(name = "状态")
-    private Long statusName;
+    private String status;
 
 }

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

@@ -1,7 +1,6 @@
 package com.ylx.point.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -19,18 +18,12 @@ public class PointActivityStatVo {
     @ApiModelProperty(name = "活动名称")
     private String name;
 
-    @JsonIgnore
-    private Integer activityType;
-
     @ApiModelProperty(name = "活动类型")
-    private Integer activityTypeName;
+    private Integer activityType;
 
-    @JsonIgnore
+    @ApiModelProperty(name = "覆盖城市")
     private String cityCode;
 
-    @ApiModelProperty(name = "覆盖城市名称")
-    private String cityName;
-
     @ApiModelProperty(name = "是否长期有效 (1:是, 0:否)")
     private Integer isPermanent;
 

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

@@ -13,6 +13,9 @@ import java.util.List;
 @ApiModel("签到活动详情vo")
 public class PointSignTaskVo extends PointActivityBaseVo {
 
+    @ApiModelProperty("签到活动任务id")
+    private Long signTaskId;
+
     @ApiModelProperty("每日签到基础积分")
     private Long basePoints;
 

nightFragrance-massage/src/main/java/com/ylx/point/enums/PointActivityExpirePolicyEnum.java

@@ -0,0 +1,20 @@
+package com.ylx.point.enums;
+
+import lombok.Getter;
+
+@Getter
+public enum PointActivityExpirePolicyEnum {
+
+    PERMANENT_VALID(0, "永久有效"),
+    TRANSACTION_EXPIRE(1, "逐笔过期"),
+    YEARLY_EXPIRE(2, "逐年过期");
+
+    private final Integer code;
+    private final String info;
+
+    PointActivityExpirePolicyEnum(Integer code, String info) {
+        this.code = code;
+        this.info = info;
+    }
+
+}

nightFragrance-massage/src/main/java/com/ylx/point/enums/PointActivityStatusEnum.java

@@ -0,0 +1,22 @@
+package com.ylx.point.enums;
+
+import lombok.Getter;
+
+@Getter
+public enum PointActivityStatusEnum {
+
+    NOT_START(0, "未开始"),
+    IN_PROGRESS(1, "进行中"),
+    FINISHED(2, "已结束"),
+    DRAFT(3, "草稿"),
+    PUBLISHED(4, "发布");
+
+    private final Integer code;
+    private final String info;
+
+    PointActivityStatusEnum(Integer code, String info) {
+        this.code = code;
+        this.info = info;
+    }
+
+}

nightFragrance-massage/src/main/java/com/ylx/point/enums/PointActivityTypeEnum.java

@@ -6,7 +6,10 @@ import lombok.Getter;
 public enum PointActivityTypeEnum {
 
     SIGN_TASK(0, "签到任务"),
-    ACTIVITY_TASK(1, "活动任务");
+    NEW_USER_ACTIVITY(1, "新手活动"),
+    DAILY_ACTIVITY(2, "每日活动"),
+    MONTHLY_ACTIVITY(3, "每月活动");
+
 
 
     private final Integer code;

nightFragrance-massage/src/main/java/com/ylx/point/mapper/PointActivityMapper.java

@@ -1,6 +1,9 @@
 package com.ylx.point.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ylx.point.domain.PointActivity;
+import com.ylx.point.domain.dto.PointActivityPageDTO;
+import com.ylx.point.domain.vo.PointActivityPageVo;
 
 import java.util.List;
 
@@ -10,8 +13,7 @@ import java.util.List;
  * @author wzj
  * @date 2026-03-25
  */
-public interface PointActivityMapper 
-{
+public interface PointActivityMapper extends BaseMapper<PointActivity> {
     /**
      * 查询积分活动主
      * 
@@ -59,4 +61,6 @@ public interface PointActivityMapper
      * @return 结果
      */
     public int deletePointActivityByIds(String[] ids);
+
+    List<PointActivityPageVo> list(PointActivityPageDTO dto);
 }

nightFragrance-massage/src/main/java/com/ylx/point/mapper/PointActivityTaskMapper.java

@@ -1,5 +1,6 @@
 package com.ylx.point.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ylx.point.domain.PointActivityTask;
 import org.apache.ibatis.annotations.Param;
 
@@ -11,25 +12,15 @@ import java.util.List;
  * @author wzj
  * @date 2026-03-25
  */
-public interface PointActivityTaskMapper {
+public interface PointActivityTaskMapper extends BaseMapper<PointActivityTask> {
 
-    /**
-     * 删除积分活动任务规则
-     *
-     * @param id 积分活动任务规则主键
-     * @return 结果
-     */
     public int deletePointActivityTaskById(String id);
 
     void insertPointActivityTask(PointActivityTask pointActivityTask);
 
     void batchInsertPointActivityTask(@Param("list") List<PointActivityTask> activityTasks);
-
-    /**
-     * 根据活动ID查询任务列表
-     *
-     * @param activityId 活动ID
-     * @return 任务列表
-     */
+    
     List<PointActivityTask> selectPointActivityTaskByActivityId(@Param("activityId") Long activityId);
+
+    int deletePointActivityTaskByActivityId(Long activityId);
 }

nightFragrance-massage/src/main/java/com/ylx/point/mapper/PointSignRewardMapper.java

@@ -1,5 +1,6 @@
 package com.ylx.point.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ylx.point.domain.PointSignReward;
 import org.apache.ibatis.annotations.Param;
 
@@ -11,60 +12,19 @@ import java.util.List;
  * @author wzj
  * @date 2026-03-25
  */
-public interface PointSignRewardMapper {
-    /**
-     * 查询签到动态奖励配置
-     *
-     * @param id 签到动态奖励配置主键
-     * @return 签到动态奖励配置
-     */
+public interface PointSignRewardMapper extends BaseMapper<PointSignReward> {
+
     public PointSignReward selectPointSignRewardById(String id);
 
-    /**
-     * 查询签到动态奖励配置列表
-     *
-     * @param pointSignReward 签到动态奖励配置
-     * @return 签到动态奖励配置集合
-     */
     public List<PointSignReward> selectPointSignRewardList(PointSignReward pointSignReward);
 
-    /**
-     * 新增签到动态奖励配置
-     *
-     * @param pointSignReward 签到动态奖励配置
-     * @return 结果
-     */
     public int insertPointSignReward(PointSignReward pointSignReward);
 
-    /**
-     * 修改签到动态奖励配置
-     *
-     * @param pointSignReward 签到动态奖励配置
-     * @return 结果
-     */
     public int updatePointSignReward(PointSignReward pointSignReward);
 
-    /**
-     * 删除签到动态奖励配置
-     *
-     * @param id 签到动态奖励配置主键
-     * @return 结果
-     */
     public int deletePointSignRewardById(String id);
 
-    /**
-     * 批量删除签到动态奖励配置
-     *
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
     public int deletePointSignRewardByIds(String[] ids);
-
-    /**
-     * 批量插入签到动态奖励配置
-     *
-     * @param rewards 签到动态奖励配置列表
-     * @return 结果
-     */
+    
     public int batchInsertPointSignReward(@Param("list") List<PointSignReward> rewards);
 }

nightFragrance-massage/src/main/java/com/ylx/point/mapper/PointSignTaskMapper.java

@@ -1,26 +1,22 @@
 package com.ylx.point.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ylx.point.domain.PointSignTask;
 import com.ylx.point.domain.vo.PointSignTaskVo;
 
 /**
  * 积分签到任务规则Mapper接口
- * 
+ *
  * @author wzj
  * @date 2026-03-25
  */
-public interface PointSignTaskMapper 
-{
+public interface PointSignTaskMapper extends BaseMapper<PointSignTask> {
 
-    /**
-     * 删除积分签到任务规则
-     * 
-     * @param id 积分签到任务规则主键
-     * @return 结果
-     */
     public int deletePointSignTaskById(String id);
 
     PointSignTaskVo getTaskWithRewards(Long activityId);
 
     int insertPointSignTask(PointSignTask pointSignTask);
+
+    int updatePointSignTask(PointSignTask pointSignTask);
 }

nightFragrance-massage/src/main/java/com/ylx/point/mapper/PointUserActivityTaskCompletionMapper.java

@@ -1,62 +1,27 @@
 package com.ylx.point.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ylx.point.domain.PointUserActivityTaskCompletion;
 
 import java.util.List;
 
 /**
  * 用户活动任务完成Mapper接口
- * 
+ *
  * @author wzj
  * @date 2026-03-25
  */
-public interface PointUserActivityTaskCompletionMapper 
-{
-    /**
-     * 查询用户活动任务完成
-     * 
-     * @param id 用户活动任务完成主键
-     * @return 用户活动任务完成
-     */
+public interface PointUserActivityTaskCompletionMapper extends BaseMapper<PointUserActivityTaskCompletion> {
+
     public PointUserActivityTaskCompletion selectPointUserActivityTaskCompletionById(String id);
 
-    /**
-     * 查询用户活动任务完成列表
-     * 
-     * @param pointUserActivityTaskCompletion 用户活动任务完成
-     * @return 用户活动任务完成集合
-     */
     public List<PointUserActivityTaskCompletion> selectPointUserActivityTaskCompletionList(PointUserActivityTaskCompletion pointUserActivityTaskCompletion);
 
-    /**
-     * 新增用户活动任务完成
-     * 
-     * @param pointUserActivityTaskCompletion 用户活动任务完成
-     * @return 结果
-     */
     public int insertPointUserActivityTaskCompletion(PointUserActivityTaskCompletion pointUserActivityTaskCompletion);
 
-    /**
-     * 修改用户活动任务完成
-     * 
-     * @param pointUserActivityTaskCompletion 用户活动任务完成
-     * @return 结果
-     */
     public int updatePointUserActivityTaskCompletion(PointUserActivityTaskCompletion pointUserActivityTaskCompletion);
 
-    /**
-     * 删除用户活动任务完成
-     * 
-     * @param id 用户活动任务完成主键
-     * @return 结果
-     */
     public int deletePointUserActivityTaskCompletionById(String id);
 
-    /**
-     * 批量删除用户活动任务完成
-     * 
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
     public int deletePointUserActivityTaskCompletionByIds(String[] ids);
 }

nightFragrance-massage/src/main/java/com/ylx/point/mapper/PointUserLogMapper.java

@@ -1,62 +1,27 @@
 package com.ylx.point.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ylx.point.domain.PointUserLog;
 
 import java.util.List;
 
 /**
  * 用户积分流水Mapper接口
- * 
+ *
  * @author wzj
  * @date 2026-03-25
  */
-public interface PointUserLogMapper 
-{
-    /**
-     * 查询用户积分流水
-     * 
-     * @param id 用户积分流水主键
-     * @return 用户积分流水
-     */
+public interface PointUserLogMapper extends BaseMapper<PointUserLog> {
+
     public PointUserLog selectPointUserLogById(String id);
 
-    /**
-     * 查询用户积分流水列表
-     * 
-     * @param pointUserLog 用户积分流水
-     * @return 用户积分流水集合
-     */
     public List<PointUserLog> selectPointUserLogList(PointUserLog pointUserLog);
 
-    /**
-     * 新增用户积分流水
-     * 
-     * @param pointUserLog 用户积分流水
-     * @return 结果
-     */
     public int insertPointUserLog(PointUserLog pointUserLog);
 
-    /**
-     * 修改用户积分流水
-     * 
-     * @param pointUserLog 用户积分流水
-     * @return 结果
-     */
     public int updatePointUserLog(PointUserLog pointUserLog);
 
-    /**
-     * 删除用户积分流水
-     * 
-     * @param id 用户积分流水主键
-     * @return 结果
-     */
     public int deletePointUserLogById(String id);
 
-    /**
-     * 批量删除用户积分流水
-     * 
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
     public int deletePointUserLogByIds(String[] ids);
 }

nightFragrance-massage/src/main/java/com/ylx/point/mapper/PointUserSignLogMapper.java

@@ -1,62 +1,27 @@
 package com.ylx.point.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ylx.point.domain.PointUserSignLog;
 
 import java.util.List;
 
 /**
  * 用户签到记录Mapper接口
- * 
+ *
  * @author wzj
  * @date 2026-03-25
  */
-public interface PointUserSignLogMapper 
-{
-    /**
-     * 查询用户签到记录
-     * 
-     * @param id 用户签到记录主键
-     * @return 用户签到记录
-     */
+public interface PointUserSignLogMapper extends BaseMapper<PointUserSignLog> {
+
     public PointUserSignLog selectPointUserSignLogById(String id);
 
-    /**
-     * 查询用户签到记录列表
-     * 
-     * @param pointUserSignLog 用户签到记录
-     * @return 用户签到记录集合
-     */
     public List<PointUserSignLog> selectPointUserSignLogList(PointUserSignLog pointUserSignLog);
 
-    /**
-     * 新增用户签到记录
-     * 
-     * @param pointUserSignLog 用户签到记录
-     * @return 结果
-     */
     public int insertPointUserSignLog(PointUserSignLog pointUserSignLog);
 
-    /**
-     * 修改用户签到记录
-     * 
-     * @param pointUserSignLog 用户签到记录
-     * @return 结果
-     */
     public int updatePointUserSignLog(PointUserSignLog pointUserSignLog);
 
-    /**
-     * 删除用户签到记录
-     * 
-     * @param id 用户签到记录主键
-     * @return 结果
-     */
     public int deletePointUserSignLogById(String id);
 
-    /**
-     * 批量删除用户签到记录
-     * 
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
     public int deletePointUserSignLogByIds(String[] ids);
 }

nightFragrance-massage/src/main/java/com/ylx/point/mapper/PointUserSignStatusMapper.java

@@ -1,62 +1,16 @@
 package com.ylx.point.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ylx.point.domain.PointUserSignStatus;
 
 import java.util.List;
 
 /**
  * 用户签到状态快照Mapper接口
- * 
+ *
  * @author wzj
  * @date 2026-03-25
  */
-public interface PointUserSignStatusMapper 
-{
-    /**
-     * 查询用户签到状态快照
-     * 
-     * @param id 用户签到状态快照主键
-     * @return 用户签到状态快照
-     */
-    public PointUserSignStatus selectPointUserSignStatusById(String id);
+public interface PointUserSignStatusMapper extends BaseMapper<PointUserSignStatus> {
 
-    /**
-     * 查询用户签到状态快照列表
-     * 
-     * @param pointUserSignStatus 用户签到状态快照
-     * @return 用户签到状态快照集合
-     */
-    public List<PointUserSignStatus> selectPointUserSignStatusList(PointUserSignStatus pointUserSignStatus);
-
-    /**
-     * 新增用户签到状态快照
-     * 
-     * @param pointUserSignStatus 用户签到状态快照
-     * @return 结果
-     */
-    public int insertPointUserSignStatus(PointUserSignStatus pointUserSignStatus);
-
-    /**
-     * 修改用户签到状态快照
-     * 
-     * @param pointUserSignStatus 用户签到状态快照
-     * @return 结果
-     */
-    public int updatePointUserSignStatus(PointUserSignStatus pointUserSignStatus);
-
-    /**
-     * 删除用户签到状态快照
-     * 
-     * @param id 用户签到状态快照主键
-     * @return 结果
-     */
-    public int deletePointUserSignStatusById(String id);
-
-    /**
-     * 批量删除用户签到状态快照
-     * 
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deletePointUserSignStatusByIds(String[] ids);
 }

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

@@ -1,6 +1,6 @@
 package com.ylx.point.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ylx.point.domain.PointActivity;
 import com.ylx.point.domain.dto.PointActivityDTO;
 import com.ylx.point.domain.dto.PointActivityPageDTO;
@@ -9,15 +9,17 @@ import com.ylx.point.domain.vo.PointActivityDetailsVo;
 import com.ylx.point.domain.vo.PointActivityPageVo;
 import com.ylx.point.domain.vo.PointActivityStatVo;
 
+import java.util.List;
+
 /**
  * 积分活动主Service接口
  *
  * @author wzj
  * @date 2026-03-25
  */
-public interface IPointActivityService {
+public interface IPointActivityService extends IService<PointActivity> {
 
-    Page<PointActivityPageVo> page(Page<PointActivity> page, PointActivityPageDTO dto);
+    List<PointActivityPageVo> list(PointActivityPageDTO dto);
 
     PointActivityDetailsVo<?> getDetailsInfo(Long id);
 

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

@@ -1,5 +1,6 @@
 package com.ylx.point.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ylx.point.domain.PointActivityTask;
 import com.ylx.point.domain.dto.PointActivityTaskDTO;
 
@@ -11,19 +12,11 @@ import java.util.List;
  * @author wzj
  * @date 2026-03-25
  */
-public interface IPointActivityTaskService {
-
-    /**
-     * 删除积分活动任务规则信息
-     *
-     * @param id 积分活动任务规则主键
-     * @return 结果
-     */
-    public int deletePointActivityTaskById(String id);
+public interface IPointActivityTaskService extends IService<PointActivityTask> {
 
     List<PointActivityTaskDTO>  selectPointActivityTaskByActivityId(Long id);
 
-    void insertPointActivityTask(PointActivityTask pointActivityTask);
-
     void batchInsertPointActivityTask(List<PointActivityTask> activityTasks);
+
+    void deletePointActivityTaskByActivityId(Long activityId);
 }

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

@@ -1,64 +1,33 @@
 package com.ylx.point.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ylx.point.domain.PointSignReward;
 
 import java.util.List;
 
 /**
  * 签到动态奖励配置Service接口
- * 
+ *
  * @author wzj
  * @date 2026-03-25
  */
-public interface IPointSignRewardService 
-{
-    /**
-     * 查询签到动态奖励配置
-     * 
-     * @param id 签到动态奖励配置主键
-     * @return 签到动态奖励配置
-     */
-    public PointSignReward selectPointSignRewardById(String id);
+public interface IPointSignRewardService extends IService<PointSignReward> {
 
     /**
      * 查询签到动态奖励配置列表
-     * 
+     *
      * @param pointSignReward 签到动态奖励配置
      * @return 签到动态奖励配置集合
      */
     public List<PointSignReward> selectPointSignRewardList(PointSignReward pointSignReward);
 
-    /**
-     * 新增签到动态奖励配置
-     * 
-     * @param pointSignReward 签到动态奖励配置
-     * @return 结果
-     */
-    public int insertPointSignReward(PointSignReward pointSignReward);
-
-    /**
-     * 修改签到动态奖励配置
-     * 
-     * @param pointSignReward 签到动态奖励配置
-     * @return 结果
-     */
-    public int updatePointSignReward(PointSignReward pointSignReward);
-
     /**
      * 批量删除签到动态奖励配置
-     * 
+     *
      * @param ids 需要删除的签到动态奖励配置主键集合
      * @return 结果
      */
     public int deletePointSignRewardByIds(String[] ids);
 
-    /**
-     * 删除签到动态奖励配置信息
-     * 
-     * @param id 签到动态奖励配置主键
-     * @return 结果
-     */
-    public int deletePointSignRewardById(String id);
-
     void batchInsertPointSignReward(List<PointSignReward> rewards);
 }

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

@@ -1,5 +1,6 @@
 package com.ylx.point.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ylx.point.domain.PointSignTask;
 import com.ylx.point.domain.vo.PointSignTaskVo;
 
@@ -9,7 +10,7 @@ import com.ylx.point.domain.vo.PointSignTaskVo;
  * @author wzj
  * @date 2026-03-25
  */
-public interface IPointSignTaskService {
+public interface IPointSignTaskService extends IService<PointSignTask> {
 
 
     /**
@@ -19,13 +20,8 @@ public interface IPointSignTaskService {
      * @return 结果
      */
     public int insertPointSignTask(PointSignTask pointSignTask);
-    /**
-     * 删除积分签到任务规则信息
-     *
-     * @param id 积分签到任务规则主键
-     * @return 结果
-     */
-    public int deletePointSignTaskById(String id);
 
     PointSignTaskVo selectPointSignTaskByActivityId(Long id);
+
+    int updatePointSignTask(PointSignTask pointSignTask);
 }

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

@@ -1,62 +1,16 @@
 package com.ylx.point.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ylx.point.domain.PointUserActivityTaskCompletion;
 
 import java.util.List;
 
 /**
  * 用户活动任务完成Service接口
- * 
+ *
  * @author wzj
  * @date 2026-03-25
  */
-public interface IPointUserActivityTaskCompletionService 
-{
-    /**
-     * 查询用户活动任务完成
-     * 
-     * @param id 用户活动任务完成主键
-     * @return 用户活动任务完成
-     */
-    public PointUserActivityTaskCompletion selectPointUserActivityTaskCompletionById(String id);
+public interface IPointUserActivityTaskCompletionService extends IService<PointUserActivityTaskCompletion> {
 
-    /**
-     * 查询用户活动任务完成列表
-     * 
-     * @param pointUserActivityTaskCompletion 用户活动任务完成
-     * @return 用户活动任务完成集合
-     */
-    public List<PointUserActivityTaskCompletion> selectPointUserActivityTaskCompletionList(PointUserActivityTaskCompletion pointUserActivityTaskCompletion);
-
-    /**
-     * 新增用户活动任务完成
-     * 
-     * @param pointUserActivityTaskCompletion 用户活动任务完成
-     * @return 结果
-     */
-    public int insertPointUserActivityTaskCompletion(PointUserActivityTaskCompletion pointUserActivityTaskCompletion);
-
-    /**
-     * 修改用户活动任务完成
-     * 
-     * @param pointUserActivityTaskCompletion 用户活动任务完成
-     * @return 结果
-     */
-    public int updatePointUserActivityTaskCompletion(PointUserActivityTaskCompletion pointUserActivityTaskCompletion);
-
-    /**
-     * 批量删除用户活动任务完成
-     * 
-     * @param ids 需要删除的用户活动任务完成主键集合
-     * @return 结果
-     */
-    public int deletePointUserActivityTaskCompletionByIds(String[] ids);
-
-    /**
-     * 删除用户活动任务完成信息
-     * 
-     * @param id 用户活动任务完成主键
-     * @return 结果
-     */
-    public int deletePointUserActivityTaskCompletionById(String id);
 }

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

@@ -1,62 +1,14 @@
 package com.ylx.point.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ylx.point.domain.PointUserLog;
 
-import java.util.List;
-
 /**
  * 用户积分流水Service接口
- * 
+ *
  * @author wzj
  * @date 2026-03-25
  */
-public interface IPointUserLogService 
-{
-    /**
-     * 查询用户积分流水
-     * 
-     * @param id 用户积分流水主键
-     * @return 用户积分流水
-     */
-    public PointUserLog selectPointUserLogById(String id);
-
-    /**
-     * 查询用户积分流水列表
-     * 
-     * @param pointUserLog 用户积分流水
-     * @return 用户积分流水集合
-     */
-    public List<PointUserLog> selectPointUserLogList(PointUserLog pointUserLog);
-
-    /**
-     * 新增用户积分流水
-     * 
-     * @param pointUserLog 用户积分流水
-     * @return 结果
-     */
-    public int insertPointUserLog(PointUserLog pointUserLog);
-
-    /**
-     * 修改用户积分流水
-     * 
-     * @param pointUserLog 用户积分流水
-     * @return 结果
-     */
-    public int updatePointUserLog(PointUserLog pointUserLog);
-
-    /**
-     * 批量删除用户积分流水
-     * 
-     * @param ids 需要删除的用户积分流水主键集合
-     * @return 结果
-     */
-    public int deletePointUserLogByIds(String[] ids);
+public interface IPointUserLogService extends IService<PointUserLog> {
 
-    /**
-     * 删除用户积分流水信息
-     * 
-     * @param id 用户积分流水主键
-     * @return 结果
-     */
-    public int deletePointUserLogById(String id);
 }

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

@@ -1,62 +1,14 @@
 package com.ylx.point.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ylx.point.domain.PointUserSignLog;
 
-import java.util.List;
-
 /**
  * 用户签到记录Service接口
- * 
+ *
  * @author wzj
  * @date 2026-03-25
  */
-public interface IPointUserSignLogService 
-{
-    /**
-     * 查询用户签到记录
-     * 
-     * @param id 用户签到记录主键
-     * @return 用户签到记录
-     */
-    public PointUserSignLog selectPointUserSignLogById(String id);
-
-    /**
-     * 查询用户签到记录列表
-     * 
-     * @param pointUserSignLog 用户签到记录
-     * @return 用户签到记录集合
-     */
-    public List<PointUserSignLog> selectPointUserSignLogList(PointUserSignLog pointUserSignLog);
-
-    /**
-     * 新增用户签到记录
-     * 
-     * @param pointUserSignLog 用户签到记录
-     * @return 结果
-     */
-    public int insertPointUserSignLog(PointUserSignLog pointUserSignLog);
-
-    /**
-     * 修改用户签到记录
-     * 
-     * @param pointUserSignLog 用户签到记录
-     * @return 结果
-     */
-    public int updatePointUserSignLog(PointUserSignLog pointUserSignLog);
-
-    /**
-     * 批量删除用户签到记录
-     * 
-     * @param ids 需要删除的用户签到记录主键集合
-     * @return 结果
-     */
-    public int deletePointUserSignLogByIds(String[] ids);
+public interface IPointUserSignLogService extends IService<PointUserSignLog> {
 
-    /**
-     * 删除用户签到记录信息
-     * 
-     * @param id 用户签到记录主键
-     * @return 结果
-     */
-    public int deletePointUserSignLogById(String id);
 }

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

@@ -1,62 +1,14 @@
 package com.ylx.point.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ylx.point.domain.PointUserSignStatus;
 
-import java.util.List;
-
 /**
  * 用户签到状态快照Service接口
- * 
+ *
  * @author wzj
  * @date 2026-03-25
  */
-public interface IPointUserSignStatusService 
-{
-    /**
-     * 查询用户签到状态快照
-     * 
-     * @param id 用户签到状态快照主键
-     * @return 用户签到状态快照
-     */
-    public PointUserSignStatus selectPointUserSignStatusById(String id);
-
-    /**
-     * 查询用户签到状态快照列表
-     * 
-     * @param pointUserSignStatus 用户签到状态快照
-     * @return 用户签到状态快照集合
-     */
-    public List<PointUserSignStatus> selectPointUserSignStatusList(PointUserSignStatus pointUserSignStatus);
-
-    /**
-     * 新增用户签到状态快照
-     * 
-     * @param pointUserSignStatus 用户签到状态快照
-     * @return 结果
-     */
-    public int insertPointUserSignStatus(PointUserSignStatus pointUserSignStatus);
-
-    /**
-     * 修改用户签到状态快照
-     * 
-     * @param pointUserSignStatus 用户签到状态快照
-     * @return 结果
-     */
-    public int updatePointUserSignStatus(PointUserSignStatus pointUserSignStatus);
-
-    /**
-     * 批量删除用户签到状态快照
-     * 
-     * @param ids 需要删除的用户签到状态快照主键集合
-     * @return 结果
-     */
-    public int deletePointUserSignStatusByIds(String[] ids);
+public interface IPointUserSignStatusService extends IService<PointUserSignStatus> {
 
-    /**
-     * 删除用户签到状态快照信息
-     * 
-     * @param id 用户签到状态快照主键
-     * @return 结果
-     */
-    public int deletePointUserSignStatusById(String id);
 }

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

@@ -1,33 +1,38 @@
 package com.ylx.point.service.impl;
 
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
 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 com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ylx.common.core.domain.R;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ylx.common.exception.base.BaseException;
 import com.ylx.common.utils.DateUtils;
+import com.ylx.point.domain.PointActivity;
 import com.ylx.point.domain.PointActivityTask;
 import com.ylx.point.domain.PointSignReward;
 import com.ylx.point.domain.PointSignTask;
 import com.ylx.point.domain.dto.*;
 import com.ylx.point.domain.vo.*;
+import com.ylx.point.enums.PointActivityExpirePolicyEnum;
+import com.ylx.point.enums.PointActivityStatusEnum;
 import com.ylx.point.enums.PointActivityTypeEnum;
+import com.ylx.point.mapper.PointActivityMapper;
+import com.ylx.point.service.IPointActivityService;
 import com.ylx.point.service.IPointActivityTaskService;
 import com.ylx.point.service.IPointSignRewardService;
 import com.ylx.point.service.IPointSignTaskService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.ylx.point.domain.PointActivity;
-import com.ylx.point.mapper.PointActivityMapper;
-import com.ylx.point.service.IPointActivityService;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.DateTimeException;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
 
 /**
  * 积分活动主Service业务层处理
@@ -36,7 +41,7 @@ import org.springframework.transaction.annotation.Transactional;
  * @date 2026-03-25
  */
 @Service
-public class PointActivityServiceImpl implements IPointActivityService {
+public class PointActivityServiceImpl extends ServiceImpl<PointActivityMapper, PointActivity> implements IPointActivityService {
     @Autowired
     private PointActivityMapper pointActivityMapper;
     @Autowired
@@ -48,8 +53,8 @@ public class PointActivityServiceImpl implements IPointActivityService {
 
 
     @Override
-    public Page<PointActivityPageVo> page(Page<PointActivity> page, PointActivityPageDTO dto) {
-        return null;
+    public List<PointActivityPageVo> list(PointActivityPageDTO dto) {
+        return pointActivityMapper.list(dto);
     }
 
     @Override
@@ -57,23 +62,22 @@ public class PointActivityServiceImpl implements IPointActivityService {
 
         PointActivity pointActivity = this.pointActivityMapper.selectPointActivityById(id);
         if (ObjectUtil.isNull(pointActivity)) {
-            return null;
+            throw new BaseException("参数有误，活动不存在");
         }
 
         Integer activityType = pointActivity.getActivityType();
         if (PointActivityTypeEnum.SIGN_TASK.getCode().equals(activityType)) {
             PointSignTaskVo vo = this.pointSignTaskService.selectPointSignTaskByActivityId(pointActivity.getId());
             BeanUtil.copyProperties(pointActivity, vo);
-            return PointActivityDetailsVo.of(PointActivityTypeEnum.SIGN_TASK.getCode(), vo);
-        } else if (PointActivityTypeEnum.ACTIVITY_TASK.getCode().equals(activityType)) {
+            return PointActivityDetailsVo.of(activityType, vo);
+        } else {
             PointActivityTaskVo vo = new PointActivityTaskVo();
             BeanUtil.copyProperties(pointActivity, vo);
             List<PointActivityTaskDTO> activityTaskList = this.pointActivityTaskService.selectPointActivityTaskByActivityId(pointActivity.getId());
             vo.setActivityTaskList(activityTaskList);
-            return PointActivityDetailsVo.of(PointActivityTypeEnum.ACTIVITY_TASK.getCode(), vo);
+            return PointActivityDetailsVo.of(activityType, vo);
         }
 
-        return PointActivityDetailsVo.of(activityType, new PointActivityBaseVo());
     }
 
     @Override
@@ -96,6 +100,30 @@ public class PointActivityServiceImpl implements IPointActivityService {
     @Transactional(rollbackFor = Exception.class)
     public void edit(PointActivityDTO dto) {
 
+        // 校验参数
+        Long id = dto.getId();
+        if (ObjectUtil.isNull(id)) {
+            throw new BaseException("活动主键id不能为空");
+        }
+
+        // 根据id获取活动详情
+        PointActivity entity = this.pointActivityMapper.selectPointActivityById(id);
+        if (ObjectUtil.isNull(entity)) {
+            throw new BaseException("参数有误，活动不存在");
+        }
+
+        // 校验活动状态
+        if (PointActivityStatusEnum.IN_PROGRESS.getCode().equals(entity.getStatus())) {
+            throw new BaseException("活动进行中，不可编辑");
+        }
+
+        // 更新活动信息
+        BeanUtil.copyProperties(dto, entity);
+        updateActivity(entity);
+
+        // 更新活动详情信息
+        updateActivityDetails(dto, id);
+
     }
 
     @Override
@@ -107,6 +135,24 @@ public class PointActivityServiceImpl implements IPointActivityService {
     @Transactional(rollbackFor = Exception.class)
     public void editValidity(PointActivityValidityDTO dto) {
 
+        // 根据dto中activityType获取全部的活动list
+        LambdaQueryWrapper<PointActivity> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(PointActivity::getActivityType, dto.getActivityType());
+        List<PointActivity> activityList = pointActivityMapper.selectList(queryWrapper);
+        if (CollectionUtil.isEmpty(activityList)) {
+            throw new BaseException("该类型的活动不存在，设置失败");
+        }
+
+        // 判断活动list中只要有活动的状态为"进行中"，修改就失败
+        boolean hasOngoingActivity = activityList.stream()
+                .anyMatch(activity -> PointActivityStatusEnum.IN_PROGRESS.getCode().equals(activity.getStatus()));
+        if (hasOngoingActivity) {
+            throw new BaseException("存在进行中的活动，无法修改有效期");
+        }
+
+        // 批量更新活动的有效期策略
+        batchUpdateExpirePolicy(activityList, dto);
+
     }
 
     private void validateActivityDTO(PointActivityDTO dto) {
@@ -122,32 +168,26 @@ public class PointActivityServiceImpl implements IPointActivityService {
     }
 
     private PointActivity createActivityEntity(PointActivityDTO dto) {
+
+        // 创建基础实体
         PointActivity entity = new PointActivity();
         BeanUtil.copyProperties(dto, entity);
 
+        // 处理时间配置
         PointActivityDTO.ActivityTimeConfig timeConfig = dto.getTimeConfig();
         entity.setStartTime(DateUtil.beginOfDay(timeConfig.getStartTime()));
-        
-        // 处理endTime，确保时间部分正确设置为23:59:59
-        Date endTime = timeConfig.getEndTime();
-        if (endTime != null) {
-            // 使用Java 8的日期时间API处理时区问题
-            java.time.LocalDateTime localDateTime = java.time.LocalDateTime.ofInstant(
-                endTime.toInstant(),
-                java.time.ZoneId.systemDefault()
-            );
-            // 设置为当天的23:59:59
-            java.time.LocalDateTime endOfDay = localDateTime.with(
-                java.time.LocalTime.of(23, 59, 59)
-            );
-            // 转换回Date对象
-            endTime = Date.from(
-                endOfDay.atZone(java.time.ZoneId.systemDefault()).toInstant()
-            );
-        }
-        entity.setEndTime(endTime);
+        entity.setEndTime(processEndTime(timeConfig.getEndTime()));
         entity.setIsPermanent(timeConfig.isPermanent() ? 1 : 0);
 
+        // 处理状态
+        if (PointActivityStatusEnum.PUBLISHED.getCode().equals(dto.getStatus())) {
+            entity.setStatus(determineActivityStatus(
+                    entity.getStartTime(),
+                    entity.getEndTime(),
+                    timeConfig.isPermanent()
+            ));
+        }
+
         return entity;
     }
 
@@ -158,14 +198,29 @@ public class PointActivityServiceImpl implements IPointActivityService {
         }
     }
 
+    private void updateActivity(PointActivity entity) {
+        int affectedRows = pointActivityMapper.updatePointActivity(entity);
+        if (affectedRows <= 0) {
+            throw new BaseException("更新积分活动失败");
+        }
+    }
+
     private void saveActivityDetails(PointActivityDTO dto, Long activityId) {
         if (PointActivityTypeEnum.SIGN_TASK.getCode().equals(dto.getActivityType())) {
             saveSignTaskDetails(dto, activityId);
-        } else if (PointActivityTypeEnum.ACTIVITY_TASK.getCode().equals(dto.getActivityType())) {
+        } else {
             saveActivityTaskDetails(dto, activityId);
         }
     }
 
+    private void updateActivityDetails(PointActivityDTO dto, Long activityId) {
+        if (PointActivityTypeEnum.SIGN_TASK.getCode().equals(dto.getActivityType())) {
+            updateSignTaskDetails(dto, activityId);
+        } else {
+            updateActivityTaskDetails(dto, activityId);
+        }
+    }
+
     private void saveSignTaskDetails(PointActivityDTO dto, Long activityId) {
         PointSignTaskDTO signTaskDTO = dto.getSignTaskDTO();
         if (ObjectUtil.isNull(signTaskDTO)) {
@@ -228,4 +283,166 @@ public class PointActivityServiceImpl implements IPointActivityService {
 
         pointActivityTaskService.batchInsertPointActivityTask(activityTasks);
     }
+
+    /**
+     * 处理结束时间，设置为当天的23:59:59
+     */
+    private Date processEndTime(Date endTime) {
+        if (endTime == null) {
+            return null;
+        }
+
+        try {
+            LocalDateTime localDateTime = LocalDateTime.ofInstant(
+                    endTime.toInstant(),
+                    ZoneId.systemDefault()
+            );
+            LocalDateTime endOfDay = localDateTime.with(
+                    java.time.LocalTime.of(23, 59, 59));
+            return Date.from(endOfDay.atZone(ZoneId.systemDefault()).toInstant());
+        } catch (DateTimeException e) {
+            throw new IllegalArgumentException("Invalid end time", e);
+        }
+    }
+
+    /**
+     * 确定活动状态
+     */
+    private Integer determineActivityStatus(Date startTime, Date endTime, boolean isPermanent) {
+        if (isPermanent) {
+            return PointActivityStatusEnum.IN_PROGRESS.getCode();
+        }
+
+        Date now = DateUtils.getNowDate();
+        if (startTime.after(now)) {
+            return PointActivityStatusEnum.NOT_START.getCode();
+        } else if (endTime != null && endTime.before(now)) {
+            return PointActivityStatusEnum.FINISHED.getCode();
+        } else {
+            return PointActivityStatusEnum.IN_PROGRESS.getCode();
+        }
+    }
+
+    /**
+     * 更新签到任务详情
+     */
+    private void updateSignTaskDetails(PointActivityDTO dto, Long activityId) {
+        PointSignTaskDTO signTaskDTO = dto.getSignTaskDTO();
+        if (ObjectUtil.isNull(signTaskDTO)) {
+            throw new BaseException("签到任务配置不能为空");
+        }
+
+        // 获取现有的签到任务
+        PointSignTaskVo existingTask = pointSignTaskService.selectPointSignTaskByActivityId(activityId);
+
+        // 更新签到任务基本信息
+        PointSignTask pointSignTask = new PointSignTask();
+        pointSignTask.setId(existingTask.getSignTaskId());
+        pointSignTask.setBasePoints(signTaskDTO.getBasePoints());
+        pointSignTask.setBreakRule(signTaskDTO.getBreakRule());
+
+        // 更新签到任务
+        int affectedRows = pointSignTaskService.updatePointSignTask(pointSignTask);
+        if (affectedRows <= 0) {
+            throw new BaseException("更新积分签到任务规则失败");
+        }
+
+        // 更新签到奖励配置
+        updateSignRewards(signTaskDTO.getSignRewardList(), pointSignTask.getId());
+    }
+
+    /**
+     * 更新签到奖励配置
+     */
+    private void updateSignRewards(List<PointSignRewardDTO> rewardList, Long taskId) {
+        // 先删除原有的奖励配置
+        PointSignReward query = new PointSignReward();
+        query.setSignTaskId(taskId);
+        List<PointSignReward> existingRewards = pointSignRewardService.selectPointSignRewardList(query);
+
+        if (CollectionUtil.isNotEmpty(existingRewards)) {
+            String[] ids = existingRewards.stream()
+                    .map(reward -> String.valueOf(reward.getId()))
+                    .toArray(String[]::new);
+            pointSignRewardService.deletePointSignRewardByIds(ids);
+        }
+
+        // 重新插入新的奖励配置
+        if (CollectionUtil.isEmpty(rewardList)) {
+            return;
+        }
+
+        List<PointSignReward> rewards = rewardList.stream()
+                .map(dto -> {
+                    PointSignReward reward = new PointSignReward();
+                    reward.setRewardPoints(dto.getRewardPoints());
+                    reward.setContinueDays(dto.getContinueDays());
+                    reward.setCreateTime(new Date());
+                    reward.setUpdateTime(reward.getCreateTime());
+                    reward.setIsDeleted(0);
+                    reward.setSignTaskId(taskId);
+                    return reward;
+                })
+                .collect(Collectors.toList());
+
+        pointSignRewardService.batchInsertPointSignReward(rewards);
+    }
+
+    /**
+     * 更新活动任务详情
+     */
+    private void updateActivityTaskDetails(PointActivityDTO dto, Long activityId) {
+
+        // 先删除原有的活动任务
+        pointActivityTaskService.deletePointActivityTaskByActivityId(activityId);
+
+        // 重新插入新的活动任务
+        List<PointActivityTaskDTO> tasks = dto.getTasks();
+        if (CollectionUtil.isEmpty(tasks)) {
+            return;
+        }
+
+        List<PointActivityTask> activityTasks = tasks.stream()
+                .map(task -> {
+                    PointActivityTask activityTask = new PointActivityTask();
+                    BeanUtil.copyProperties(task, activityTask);
+                    activityTask.setActivityId(activityId);
+                    activityTask.setIsDeleted(0);
+                    activityTask.setCreateTime(new Date());
+                    activityTask.setUpdateTime(activityTask.getCreateTime());
+                    return activityTask;
+                })
+                .collect(Collectors.toList());
+
+        pointActivityTaskService.batchInsertPointActivityTask(activityTasks);
+    }
+
+    private void batchUpdateExpirePolicy(List<PointActivity> activityList, PointActivityValidityDTO dto) {
+        Integer expirePolicy = dto.getExpirePolicy();
+
+        // 使用Stream处理活动列表
+        List<PointActivity> updateList = activityList.stream()
+                .peek(activity -> {
+                    activity.setExpirePolicy(expirePolicy);
+
+                    // 根据策略设置不同的过期时间字段
+                    if (PointActivityExpirePolicyEnum.TRANSACTION_EXPIRE.getCode().equals(expirePolicy)) {
+                        activity.setExpireDays(dto.getExpireDays());
+                        activity.setExpireYear(null);
+                    } else if (PointActivityExpirePolicyEnum.YEARLY_EXPIRE.getCode().equals(expirePolicy)) {
+                        activity.setExpireYear(dto.getExpireYear());
+                        activity.setExpireDays(null);
+                    } else {
+                        activity.setExpireDays(null);
+                        activity.setExpireYear(null);
+                    }
+                })
+                .collect(Collectors.toList());
+
+        // 批量更新数据库
+        if (CollectionUtil.isNotEmpty(updateList)) {
+            super.updateBatchById(updateList);
+        }
+    }
+
 }

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

@@ -2,6 +2,7 @@ package com.ylx.point.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ylx.common.utils.DateUtils;
 import com.ylx.point.domain.PointActivityTask;
 import com.ylx.point.domain.dto.PointActivityTaskDTO;
@@ -9,6 +10,7 @@ import com.ylx.point.mapper.PointActivityTaskMapper;
 import com.ylx.point.service.IPointActivityTaskService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
 import java.util.List;
@@ -21,21 +23,10 @@ import java.util.List;
  * @date 2026-03-25
  */
 @Service
-public class PointActivityTaskServiceImpl implements IPointActivityTaskService {
+public class PointActivityTaskServiceImpl extends ServiceImpl<PointActivityTaskMapper,PointActivityTask> implements IPointActivityTaskService {
     @Autowired
     private PointActivityTaskMapper pointActivityTaskMapper;
 
-    /**
-     * 删除积分活动任务规则信息
-     *
-     * @param id 积分活动任务规则主键
-     * @return 结果
-     */
-    @Override
-    public int deletePointActivityTaskById(String id) {
-        return pointActivityTaskMapper.deletePointActivityTaskById(id);
-    }
-
     @Override
     public List<PointActivityTaskDTO> selectPointActivityTaskByActivityId(Long id) {
         // 查询活动任务列表
@@ -54,11 +45,7 @@ public class PointActivityTaskServiceImpl implements IPointActivityTaskService {
     }
 
     @Override
-    public void insertPointActivityTask(PointActivityTask pointActivityTask) {
-        pointActivityTaskMapper.insertPointActivityTask(pointActivityTask);
-    }
-
-    @Override
+    @Transactional(rollbackFor = Exception.class)
     public void batchInsertPointActivityTask(List<PointActivityTask> activityTasks) {
         if (CollectionUtil.isEmpty(activityTasks)) {
             return;
@@ -73,4 +60,11 @@ public class PointActivityTaskServiceImpl implements IPointActivityTaskService {
         // 批量插入
         pointActivityTaskMapper.batchInsertPointActivityTask(activityTasks);
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deletePointActivityTaskByActivityId(Long activityId) {
+        pointActivityTaskMapper.deletePointActivityTaskByActivityId(activityId);
+    }
+
 }

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

@@ -1,6 +1,7 @@
 package com.ylx.point.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ylx.common.utils.DateUtils;
 import com.ylx.point.domain.PointSignReward;
 import com.ylx.point.mapper.PointSignRewardMapper;
@@ -19,23 +20,10 @@ import java.util.List;
  * @date 2026-03-25
  */
 @Service
-public class PointSignRewardServiceImpl implements IPointSignRewardService
-{
+public class PointSignRewardServiceImpl extends ServiceImpl<PointSignRewardMapper, PointSignReward> implements IPointSignRewardService {
     @Autowired
     private PointSignRewardMapper pointSignRewardMapper;
 
-    /**
-     * 查询签到动态奖励配置
-     *
-     * @param id 签到动态奖励配置主键
-     * @return 签到动态奖励配置
-     */
-    @Override
-    public PointSignReward selectPointSignRewardById(String id)
-    {
-        return pointSignRewardMapper.selectPointSignRewardById(id);
-    }
-
     /**
      * 查询签到动态奖励配置列表
      *
@@ -43,37 +31,10 @@ public class PointSignRewardServiceImpl implements IPointSignRewardService
      * @return 签到动态奖励配置
      */
     @Override
-    public List<PointSignReward> selectPointSignRewardList(PointSignReward pointSignReward)
-    {
+    public List<PointSignReward> selectPointSignRewardList(PointSignReward pointSignReward) {
         return pointSignRewardMapper.selectPointSignRewardList(pointSignReward);
     }
 
-    /**
-     * 新增签到动态奖励配置
-     *
-     * @param pointSignReward 签到动态奖励配置
-     * @return 结果
-     */
-    @Override
-    public int insertPointSignReward(PointSignReward pointSignReward)
-    {
-        pointSignReward.setCreateTime(DateUtils.getNowDate());
-        return pointSignRewardMapper.insertPointSignReward(pointSignReward);
-    }
-
-    /**
-     * 修改签到动态奖励配置
-     *
-     * @param pointSignReward 签到动态奖励配置
-     * @return 结果
-     */
-    @Override
-    public int updatePointSignReward(PointSignReward pointSignReward)
-    {
-        pointSignReward.setUpdateTime(DateUtils.getNowDate());
-        return pointSignRewardMapper.updatePointSignReward(pointSignReward);
-    }
-
     /**
      * 批量删除签到动态奖励配置
      *
@@ -81,22 +42,9 @@ public class PointSignRewardServiceImpl implements IPointSignRewardService
      * @return 结果
      */
     @Override
-    public int deletePointSignRewardByIds(String[] ids)
-    {
-        return pointSignRewardMapper.deletePointSignRewardByIds(ids);
-    }
-
-    /**
-     * 删除签到动态奖励配置信息
-     *
-     * @param id 签到动态奖励配置主键
-     * @return 结果
-     */
-    @Override
     @Transactional(rollbackFor = Exception.class)
-    public int deletePointSignRewardById(String id)
-    {
-        return pointSignRewardMapper.deletePointSignRewardById(id);
+    public int deletePointSignRewardByIds(String[] ids) {
+        return pointSignRewardMapper.deletePointSignRewardByIds(ids);
     }
 
     @Override
@@ -105,13 +53,13 @@ public class PointSignRewardServiceImpl implements IPointSignRewardService
         if (CollectionUtil.isEmpty(rewards)) {
             return;
         }
-        
+
         // 设置创建时间
         Date now = DateUtils.getNowDate();
         for (PointSignReward reward : rewards) {
             reward.setCreateTime(now);
         }
-        
+
         // 批量插入
         pointSignRewardMapper.batchInsertPointSignReward(rewards);
     }

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

@@ -3,6 +3,7 @@ package com.ylx.point.service.impl;
 import java.util.List;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ylx.common.utils.DateUtils;
 import com.ylx.point.domain.vo.PointSignTaskVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,7 +20,7 @@ import org.springframework.transaction.annotation.Transactional;
  * @date 2026-03-25
  */
 @Service
-public class PointSignTaskServiceImpl implements IPointSignTaskService {
+public class PointSignTaskServiceImpl extends ServiceImpl<PointSignTaskMapper, PointSignTask> implements IPointSignTaskService {
     @Autowired
     private PointSignTaskMapper pointSignTaskMapper;
 
@@ -36,21 +37,17 @@ public class PointSignTaskServiceImpl implements IPointSignTaskService {
         return pointSignTaskMapper.insertPointSignTask(pointSignTask);
     }
 
-    /**
-     * 删除积分签到任务规则信息
-     *
-     * @param id 积分签到任务规则主键
-     * @return 结果
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public int deletePointSignTaskById(String id) {
-        return pointSignTaskMapper.deletePointSignTaskById(id);
-    }
-
     @Override
     public PointSignTaskVo selectPointSignTaskByActivityId(Long id) {
         PointSignTaskVo vo = pointSignTaskMapper.getTaskWithRewards(id);
         return ObjectUtil.isNull(vo) ? new PointSignTaskVo() : vo;
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int updatePointSignTask(PointSignTask pointSignTask) {
+        pointSignTask.setUpdateTime(DateUtils.getNowDate());
+        return pointSignTaskMapper.updatePointSignTask(pointSignTask);
+
+    }
 }

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

@@ -1,12 +1,11 @@
 package com.ylx.point.service.impl;
 
-import java.util.List;
-import com.ylx.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ylx.point.mapper.PointUserActivityTaskCompletionMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ylx.point.domain.PointUserActivityTaskCompletion;
+import com.ylx.point.mapper.PointUserActivityTaskCompletionMapper;
 import com.ylx.point.service.IPointUserActivityTaskCompletionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 /**
  * 用户活动任务完成Service业务层处理
@@ -15,82 +14,8 @@ import com.ylx.point.service.IPointUserActivityTaskCompletionService;
  * @date 2026-03-25
  */
 @Service
-public class PointUserActivityTaskCompletionServiceImpl implements IPointUserActivityTaskCompletionService
-{
+public class PointUserActivityTaskCompletionServiceImpl extends ServiceImpl<PointUserActivityTaskCompletionMapper, PointUserActivityTaskCompletion> implements IPointUserActivityTaskCompletionService {
     @Autowired
     private PointUserActivityTaskCompletionMapper pointUserActivityTaskCompletionMapper;
 
-    /**
-     * 查询用户活动任务完成
-     *
-     * @param id 用户活动任务完成主键
-     * @return 用户活动任务完成
-     */
-    @Override
-    public PointUserActivityTaskCompletion selectPointUserActivityTaskCompletionById(String id)
-    {
-        return pointUserActivityTaskCompletionMapper.selectPointUserActivityTaskCompletionById(id);
-    }
-
-    /**
-     * 查询用户活动任务完成列表
-     *
-     * @param pointUserActivityTaskCompletion 用户活动任务完成
-     * @return 用户活动任务完成
-     */
-    @Override
-    public List<PointUserActivityTaskCompletion> selectPointUserActivityTaskCompletionList(PointUserActivityTaskCompletion pointUserActivityTaskCompletion)
-    {
-        return pointUserActivityTaskCompletionMapper.selectPointUserActivityTaskCompletionList(pointUserActivityTaskCompletion);
-    }
-
-    /**
-     * 新增用户活动任务完成
-     *
-     * @param pointUserActivityTaskCompletion 用户活动任务完成
-     * @return 结果
-     */
-    @Override
-    public int insertPointUserActivityTaskCompletion(PointUserActivityTaskCompletion pointUserActivityTaskCompletion)
-    {
-        pointUserActivityTaskCompletion.setCreateTime(DateUtils.getNowDate());
-        return pointUserActivityTaskCompletionMapper.insertPointUserActivityTaskCompletion(pointUserActivityTaskCompletion);
-    }
-
-    /**
-     * 修改用户活动任务完成
-     *
-     * @param pointUserActivityTaskCompletion 用户活动任务完成
-     * @return 结果
-     */
-    @Override
-    public int updatePointUserActivityTaskCompletion(PointUserActivityTaskCompletion pointUserActivityTaskCompletion)
-    {
-        pointUserActivityTaskCompletion.setUpdateTime(DateUtils.getNowDate());
-        return pointUserActivityTaskCompletionMapper.updatePointUserActivityTaskCompletion(pointUserActivityTaskCompletion);
-    }
-
-    /**
-     * 批量删除用户活动任务完成
-     *
-     * @param ids 需要删除的用户活动任务完成主键
-     * @return 结果
-     */
-    @Override
-    public int deletePointUserActivityTaskCompletionByIds(String[] ids)
-    {
-        return pointUserActivityTaskCompletionMapper.deletePointUserActivityTaskCompletionByIds(ids);
-    }
-
-    /**
-     * 删除用户活动任务完成信息
-     *
-     * @param id 用户活动任务完成主键
-     * @return 结果
-     */
-    @Override
-    public int deletePointUserActivityTaskCompletionById(String id)
-    {
-        return pointUserActivityTaskCompletionMapper.deletePointUserActivityTaskCompletionById(id);
-    }
 }

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

@@ -1,12 +1,11 @@
 package com.ylx.point.service.impl;
 
-import java.util.List;
-import com.ylx.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ylx.point.mapper.PointUserLogMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ylx.point.domain.PointUserLog;
+import com.ylx.point.mapper.PointUserLogMapper;
 import com.ylx.point.service.IPointUserLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 /**
  * 用户积分流水Service业务层处理
@@ -15,81 +14,8 @@ import com.ylx.point.service.IPointUserLogService;
  * @date 2026-03-25
  */
 @Service
-public class PointUserLogServiceImpl implements IPointUserLogService
-{
+public class PointUserLogServiceImpl extends ServiceImpl<PointUserLogMapper, PointUserLog> implements IPointUserLogService {
     @Autowired
     private PointUserLogMapper pointUserLogMapper;
 
-    /**
-     * 查询用户积分流水
-     *
-     * @param id 用户积分流水主键
-     * @return 用户积分流水
-     */
-    @Override
-    public PointUserLog selectPointUserLogById(String id)
-    {
-        return pointUserLogMapper.selectPointUserLogById(id);
-    }
-
-    /**
-     * 查询用户积分流水列表
-     *
-     * @param pointUserLog 用户积分流水
-     * @return 用户积分流水
-     */
-    @Override
-    public List<PointUserLog> selectPointUserLogList(PointUserLog pointUserLog)
-    {
-        return pointUserLogMapper.selectPointUserLogList(pointUserLog);
-    }
-
-    /**
-     * 新增用户积分流水
-     *
-     * @param pointUserLog 用户积分流水
-     * @return 结果
-     */
-    @Override
-    public int insertPointUserLog(PointUserLog pointUserLog)
-    {
-        pointUserLog.setCreateTime(DateUtils.getNowDate());
-        return pointUserLogMapper.insertPointUserLog(pointUserLog);
-    }
-
-    /**
-     * 修改用户积分流水
-     *
-     * @param pointUserLog 用户积分流水
-     * @return 结果
-     */
-    @Override
-    public int updatePointUserLog(PointUserLog pointUserLog)
-    {
-        return pointUserLogMapper.updatePointUserLog(pointUserLog);
-    }
-
-    /**
-     * 批量删除用户积分流水
-     *
-     * @param ids 需要删除的用户积分流水主键
-     * @return 结果
-     */
-    @Override
-    public int deletePointUserLogByIds(String[] ids)
-    {
-        return pointUserLogMapper.deletePointUserLogByIds(ids);
-    }
-
-    /**
-     * 删除用户积分流水信息
-     *
-     * @param id 用户积分流水主键
-     * @return 结果
-     */
-    @Override
-    public int deletePointUserLogById(String id)
-    {
-        return pointUserLogMapper.deletePointUserLogById(id);
-    }
 }

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

@@ -1,6 +1,8 @@
 package com.ylx.point.service.impl;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ylx.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -15,81 +17,8 @@ import com.ylx.point.service.IPointUserSignLogService;
  * @date 2026-03-25
  */
 @Service
-public class PointUserSignLogServiceImpl implements IPointUserSignLogService
-{
+public class PointUserSignLogServiceImpl extends ServiceImpl<PointUserSignLogMapper, PointUserSignLog> implements IPointUserSignLogService {
     @Autowired
     private PointUserSignLogMapper pointUserSignLogMapper;
 
-    /**
-     * 查询用户签到记录
-     *
-     * @param id 用户签到记录主键
-     * @return 用户签到记录
-     */
-    @Override
-    public PointUserSignLog selectPointUserSignLogById(String id)
-    {
-        return pointUserSignLogMapper.selectPointUserSignLogById(id);
-    }
-
-    /**
-     * 查询用户签到记录列表
-     *
-     * @param pointUserSignLog 用户签到记录
-     * @return 用户签到记录
-     */
-    @Override
-    public List<PointUserSignLog> selectPointUserSignLogList(PointUserSignLog pointUserSignLog)
-    {
-        return pointUserSignLogMapper.selectPointUserSignLogList(pointUserSignLog);
-    }
-
-    /**
-     * 新增用户签到记录
-     *
-     * @param pointUserSignLog 用户签到记录
-     * @return 结果
-     */
-    @Override
-    public int insertPointUserSignLog(PointUserSignLog pointUserSignLog)
-    {
-        pointUserSignLog.setCreateTime(DateUtils.getNowDate());
-        return pointUserSignLogMapper.insertPointUserSignLog(pointUserSignLog);
-    }
-
-    /**
-     * 修改用户签到记录
-     *
-     * @param pointUserSignLog 用户签到记录
-     * @return 结果
-     */
-    @Override
-    public int updatePointUserSignLog(PointUserSignLog pointUserSignLog)
-    {
-        return pointUserSignLogMapper.updatePointUserSignLog(pointUserSignLog);
-    }
-
-    /**
-     * 批量删除用户签到记录
-     *
-     * @param ids 需要删除的用户签到记录主键
-     * @return 结果
-     */
-    @Override
-    public int deletePointUserSignLogByIds(String[] ids)
-    {
-        return pointUserSignLogMapper.deletePointUserSignLogByIds(ids);
-    }
-
-    /**
-     * 删除用户签到记录信息
-     *
-     * @param id 用户签到记录主键
-     * @return 结果
-     */
-    @Override
-    public int deletePointUserSignLogById(String id)
-    {
-        return pointUserSignLogMapper.deletePointUserSignLogById(id);
-    }
 }

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

@@ -1,6 +1,8 @@
 package com.ylx.point.service.impl;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ylx.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -15,81 +17,8 @@ import com.ylx.point.service.IPointUserSignStatusService;
  * @date 2026-03-25
  */
 @Service
-public class PointUserSignStatusServiceImpl implements IPointUserSignStatusService
-{
+public class PointUserSignStatusServiceImpl extends ServiceImpl<PointUserSignStatusMapper, PointUserSignStatus> implements IPointUserSignStatusService {
     @Autowired
     private PointUserSignStatusMapper pointUserSignStatusMapper;
 
-    /**
-     * 查询用户签到状态快照
-     *
-     * @param id 用户签到状态快照主键
-     * @return 用户签到状态快照
-     */
-    @Override
-    public PointUserSignStatus selectPointUserSignStatusById(String id)
-    {
-        return pointUserSignStatusMapper.selectPointUserSignStatusById(id);
-    }
-
-    /**
-     * 查询用户签到状态快照列表
-     *
-     * @param pointUserSignStatus 用户签到状态快照
-     * @return 用户签到状态快照
-     */
-    @Override
-    public List<PointUserSignStatus> selectPointUserSignStatusList(PointUserSignStatus pointUserSignStatus)
-    {
-        return pointUserSignStatusMapper.selectPointUserSignStatusList(pointUserSignStatus);
-    }
-
-    /**
-     * 新增用户签到状态快照
-     *
-     * @param pointUserSignStatus 用户签到状态快照
-     * @return 结果
-     */
-    @Override
-    public int insertPointUserSignStatus(PointUserSignStatus pointUserSignStatus)
-    {
-        return pointUserSignStatusMapper.insertPointUserSignStatus(pointUserSignStatus);
-    }
-
-    /**
-     * 修改用户签到状态快照
-     *
-     * @param pointUserSignStatus 用户签到状态快照
-     * @return 结果
-     */
-    @Override
-    public int updatePointUserSignStatus(PointUserSignStatus pointUserSignStatus)
-    {
-        pointUserSignStatus.setUpdateTime(DateUtils.getNowDate());
-        return pointUserSignStatusMapper.updatePointUserSignStatus(pointUserSignStatus);
-    }
-
-    /**
-     * 批量删除用户签到状态快照
-     *
-     * @param ids 需要删除的用户签到状态快照主键
-     * @return 结果
-     */
-    @Override
-    public int deletePointUserSignStatusByIds(String[] ids)
-    {
-        return pointUserSignStatusMapper.deletePointUserSignStatusByIds(ids);
-    }
-
-    /**
-     * 删除用户签到状态快照信息
-     *
-     * @param id 用户签到状态快照主键
-     * @return 结果
-     */
-    @Override
-    public int deletePointUserSignStatusById(String id)
-    {
-        return pointUserSignStatusMapper.deletePointUserSignStatusById(id);
-    }
 }

nightFragrance-massage/src/main/resources/mapper/point/PointActivityMapper.xml

@@ -50,7 +50,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectPointActivityVo"/>
         where id = #{id}
     </select>
-        
+    <select id="list" parameterType="PointActivityPageDTO" resultType="com.ylx.point.domain.vo.PointActivityPageVo">
+        <include refid="selectPointActivityVo"/>
+        <where>
+            <if test="activityType != null">
+                AND activity_type = #{activityType}
+            </if>
+            <if test="cityCode != null and cityCode != ''">
+                AND city_code = #{cityCode}
+            </if>
+            <if test="status != null">
+                AND status = #{status}
+            </if>
+            <if test="startTime != null and startTime != ''"><!-- 开始时间检索 -->
+                and date_format(start_time,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d')
+            </if>
+            <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+                and date_format(end_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
+            </if>
+        </where>
+        order by create_time desc ,sort_order desc
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+
     <insert id="insertPointActivity" parameterType="PointActivity" useGeneratedKeys="true" keyProperty="id">
         insert into point_activity
         <trim prefix="(" suffix=")" suffixOverrides=",">

nightFragrance-massage/src/main/resources/mapper/point/PointActivityTaskMapper.xml

@@ -18,10 +18,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="isDeleted"    column="is_deleted"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
+        <result property="status"    column="status"    />
     </resultMap>
 
     <sql id="selectPointActivityTaskVo">
-        select id, activity_id, task_name, task_value, trigger_name, trigger_value, reward_points, frequency_limit_name, frequency_limit_value, sort_order, is_deleted, create_time, update_time from point_activity_task
+        select id, activity_id, task_name, task_value, trigger_name, trigger_value, reward_points, frequency_limit_name, frequency_limit_value, sort_order, is_deleted, create_time, update_time, status from point_activity_task
     </sql>
 
     <select id="selectPointActivityTaskList" parameterType="PointActivityTask" resultMap="PointActivityTaskResult">
@@ -60,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isDeleted != null">is_deleted,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateTime != null">update_time,</if>
+            <if test="status != null">status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="activityId != null">#{activityId},</if>
@@ -74,13 +76,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isDeleted != null">#{isDeleted},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="status != null">#{status},</if>
          </trim>
     </insert>
     <insert id="batchInsertPointActivityTask">
-        insert into point_activity_task (activity_id, task_name, task_value, trigger_name, trigger_value, reward_points, frequency_limit_name, frequency_limit_value, sort_order, is_deleted, create_time, update_time)
+        insert into point_activity_task (activity_id, task_name, task_value, trigger_name, trigger_value, reward_points, frequency_limit_name, frequency_limit_value, sort_order, is_deleted, create_time, update_time, status)
         values
         <foreach collection="list" item="item" separator=",">
-            (#{item.activityId}, #{item.taskName}, #{item.taskValue},#{item.triggerName}, #{item.triggerValue}, #{item.rewardPoints}, #{item.frequencyLimitName}, #{item.frequencyLimitValue}, #{item.sortOrder}, #{item.isDeleted}, #{item.createTime}, #{item.updateTime})
+            (#{item.activityId}, #{item.taskName}, #{item.taskValue},#{item.triggerName}, #{item.triggerValue}, #{item.rewardPoints}, #{item.frequencyLimitName}, #{item.frequencyLimitValue}, #{item.sortOrder}, #{item.isDeleted}, #{item.createTime}, #{item.updateTime}, #{item.status})
         </foreach>
     </insert>
 
@@ -99,6 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isDeleted != null">is_deleted = #{isDeleted},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="status != null">status = #{status},</if>
         </trim>
         where id = #{id}
     </update>
@@ -107,6 +111,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         delete from point_activity_task where id = #{id}
     </delete>
 
+    <delete id="deletePointActivityTaskByActivityId" parameterType="Long">
+        delete from point_activity_task where activity_id = #{activityId}
+    </delete>
+
     <select id="selectPointActivityTaskByActivityId" resultMap="PointActivityTaskResult">
         <include refid="selectPointActivityTaskVo"/>
         where activity_id = #{activityId} and is_deleted = 0

nightFragrance-massage/src/main/resources/mapper/point/PointSignTaskMapper.xml

@@ -15,6 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <resultMap id="PointSignTaskMap" type="com.ylx.point.domain.vo.PointSignTaskVo">
+        <result property="signTaskId"    column="signTaskId"    />
         <result column="base_points" property="basePoints"/>
         <result column="break_rule" property="breakRule"/>
         <!-- 关联奖励列表 -->
@@ -28,12 +29,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, activity_id, base_points, break_rule, is_deleted, create_time, update_time from point_sign_task
     </sql>
 
+    <update id="updatePointSignTask" parameterType="PointSignTask">
+        update point_sign_task
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="activityId != null">activity_id = #{activityId},</if>
+            <if test="basePoints != null">base_points = #{basePoints},</if>
+            <if test="breakRule != null">break_rule = #{breakRule},</if>
+            <if test="isDeleted != null">is_deleted = #{isDeleted},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
     <delete id="deletePointSignTaskById" parameterType="String">
         delete from point_sign_task where id = #{id}
     </delete>
 
     <select id="getTaskWithRewards" resultMap="PointSignTaskMap">
         SELECT
+            t.id AS signTaskId,
             t.base_points,
             t.break_rule,
             r.reward_points,

nightFragrance-massage/src/main/resources/mapper/point/PointUserActivityTaskCompletionMapper.xml

@@ -17,78 +17,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="completedDate"    column="completed_date"    />
     </resultMap>
 
-    <sql id="selectPointUserActivityTaskCompletionVo">
-        select id, activity_id, task_id, task_type, user_id, completed_count, last_completed_time, create_time, update_time, completed_date from point_user_activity_task_completion
-    </sql>
-
-    <select id="selectPointUserActivityTaskCompletionList" parameterType="PointUserActivityTaskCompletion" resultMap="PointUserActivityTaskCompletionResult">
-        <include refid="selectPointUserActivityTaskCompletionVo"/>
-        <where>  
-            <if test="activityId != null "> and activity_id = #{activityId}</if>
-            <if test="taskId != null "> and task_id = #{taskId}</if>
-            <if test="taskType != null "> and task_type = #{taskType}</if>
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="completedCount != null "> and completed_count = #{completedCount}</if>
-            <if test="lastCompletedTime != null "> and last_completed_time = #{lastCompletedTime}</if>
-            <if test="completedDate != null "> and completed_date = #{completedDate}</if>
-        </where>
-    </select>
-    
-    <select id="selectPointUserActivityTaskCompletionById" parameterType="String" resultMap="PointUserActivityTaskCompletionResult">
-        <include refid="selectPointUserActivityTaskCompletionVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertPointUserActivityTaskCompletion" parameterType="PointUserActivityTaskCompletion" useGeneratedKeys="true" keyProperty="id">
-        insert into point_user_activity_task_completion
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="activityId != null">activity_id,</if>
-            <if test="taskId != null">task_id,</if>
-            <if test="taskType != null">task_type,</if>
-            <if test="userId != null">user_id,</if>
-            <if test="completedCount != null">completed_count,</if>
-            <if test="lastCompletedTime != null">last_completed_time,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="completedDate != null">completed_date,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="activityId != null">#{activityId},</if>
-            <if test="taskId != null">#{taskId},</if>
-            <if test="taskType != null">#{taskType},</if>
-            <if test="userId != null">#{userId},</if>
-            <if test="completedCount != null">#{completedCount},</if>
-            <if test="lastCompletedTime != null">#{lastCompletedTime},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="completedDate != null">#{completedDate},</if>
-         </trim>
-    </insert>
-
-    <update id="updatePointUserActivityTaskCompletion" parameterType="PointUserActivityTaskCompletion">
-        update point_user_activity_task_completion
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="activityId != null">activity_id = #{activityId},</if>
-            <if test="taskId != null">task_id = #{taskId},</if>
-            <if test="taskType != null">task_type = #{taskType},</if>
-            <if test="userId != null">user_id = #{userId},</if>
-            <if test="completedCount != null">completed_count = #{completedCount},</if>
-            <if test="lastCompletedTime != null">last_completed_time = #{lastCompletedTime},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="completedDate != null">completed_date = #{completedDate},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deletePointUserActivityTaskCompletionById" parameterType="String">
-        delete from point_user_activity_task_completion where id = #{id}
-    </delete>
-
-    <delete id="deletePointUserActivityTaskCompletionByIds" parameterType="String">
-        delete from point_user_activity_task_completion where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
 </mapper>

nightFragrance-massage/src/main/resources/mapper/point/PointUserLogMapper.xml

@@ -22,99 +22,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="month"    column="month"    />
     </resultMap>
 
-    <sql id="selectPointUserLogVo">
-        select id, user_id, activity_id, activity_name, task_id, task_type, points, balance_after, source_log_id, biz_order_id, expire_time, is_expired, create_time, op_type, month from point_user_log
-    </sql>
-
-    <select id="selectPointUserLogList" parameterType="PointUserLog" resultMap="PointUserLogResult">
-        <include refid="selectPointUserLogVo"/>
-        <where>  
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="activityId != null "> and activity_id = #{activityId}</if>
-            <if test="activityName != null  and activityName != ''"> and activity_name like concat('%', #{activityName}, '%')</if>
-            <if test="taskId != null "> and task_id = #{taskId}</if>
-            <if test="taskType != null "> and task_type = #{taskType}</if>
-            <if test="points != null "> and points = #{points}</if>
-            <if test="balanceAfter != null "> and balance_after = #{balanceAfter}</if>
-            <if test="sourceLogId != null "> and source_log_id = #{sourceLogId}</if>
-            <if test="bizOrderId != null  and bizOrderId != ''"> and biz_order_id = #{bizOrderId}</if>
-            <if test="expireTime != null "> and expire_time = #{expireTime}</if>
-            <if test="isExpired != null "> and is_expired = #{isExpired}</if>
-            <if test="opType != null "> and op_type = #{opType}</if>
-            <if test="month != null  and month != ''"> and month = #{month}</if>
-        </where>
-    </select>
-    
-    <select id="selectPointUserLogById" parameterType="String" resultMap="PointUserLogResult">
-        <include refid="selectPointUserLogVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertPointUserLog" parameterType="PointUserLog" useGeneratedKeys="true" keyProperty="id">
-        insert into point_user_log
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="userId != null">user_id,</if>
-            <if test="activityId != null">activity_id,</if>
-            <if test="activityName != null and activityName != ''">activity_name,</if>
-            <if test="taskId != null">task_id,</if>
-            <if test="taskType != null">task_type,</if>
-            <if test="points != null">points,</if>
-            <if test="balanceAfter != null">balance_after,</if>
-            <if test="sourceLogId != null">source_log_id,</if>
-            <if test="bizOrderId != null">biz_order_id,</if>
-            <if test="expireTime != null">expire_time,</if>
-            <if test="isExpired != null">is_expired,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="opType != null">op_type,</if>
-            <if test="month != null and month != ''">month,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="userId != null">#{userId},</if>
-            <if test="activityId != null">#{activityId},</if>
-            <if test="activityName != null and activityName != ''">#{activityName},</if>
-            <if test="taskId != null">#{taskId},</if>
-            <if test="taskType != null">#{taskType},</if>
-            <if test="points != null">#{points},</if>
-            <if test="balanceAfter != null">#{balanceAfter},</if>
-            <if test="sourceLogId != null">#{sourceLogId},</if>
-            <if test="bizOrderId != null">#{bizOrderId},</if>
-            <if test="expireTime != null">#{expireTime},</if>
-            <if test="isExpired != null">#{isExpired},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="opType != null">#{opType},</if>
-            <if test="month != null and month != ''">#{month},</if>
-         </trim>
-    </insert>
-
-    <update id="updatePointUserLog" parameterType="PointUserLog">
-        update point_user_log
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="userId != null">user_id = #{userId},</if>
-            <if test="activityId != null">activity_id = #{activityId},</if>
-            <if test="activityName != null and activityName != ''">activity_name = #{activityName},</if>
-            <if test="taskId != null">task_id = #{taskId},</if>
-            <if test="taskType != null">task_type = #{taskType},</if>
-            <if test="points != null">points = #{points},</if>
-            <if test="balanceAfter != null">balance_after = #{balanceAfter},</if>
-            <if test="sourceLogId != null">source_log_id = #{sourceLogId},</if>
-            <if test="bizOrderId != null">biz_order_id = #{bizOrderId},</if>
-            <if test="expireTime != null">expire_time = #{expireTime},</if>
-            <if test="isExpired != null">is_expired = #{isExpired},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="opType != null">op_type = #{opType},</if>
-            <if test="month != null and month != ''">month = #{month},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deletePointUserLogById" parameterType="String">
-        delete from point_user_log where id = #{id}
-    </delete>
-
-    <delete id="deletePointUserLogByIds" parameterType="String">
-        delete from point_user_log where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
 </mapper>

nightFragrance-massage/src/main/resources/mapper/point/PointUserSignLogMapper.xml

@@ -16,75 +16,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"    column="create_time"    />
     </resultMap>
 
-    <sql id="selectPointUserSignLogVo">
-        select id, user_id, activity_id, task_id, sign_date, continuous_days, points, is_make_up, create_time from point_user_sign_log
-    </sql>
-
-    <select id="selectPointUserSignLogList" parameterType="PointUserSignLog" resultMap="PointUserSignLogResult">
-        <include refid="selectPointUserSignLogVo"/>
-        <where>  
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="activityId != null "> and activity_id = #{activityId}</if>
-            <if test="taskId != null "> and task_id = #{taskId}</if>
-            <if test="signDate != null "> and sign_date = #{signDate}</if>
-            <if test="continuousDays != null "> and continuous_days = #{continuousDays}</if>
-            <if test="points != null "> and points = #{points}</if>
-            <if test="isMakeUp != null "> and is_make_up = #{isMakeUp}</if>
-        </where>
-    </select>
-    
-    <select id="selectPointUserSignLogById" parameterType="String" resultMap="PointUserSignLogResult">
-        <include refid="selectPointUserSignLogVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertPointUserSignLog" parameterType="PointUserSignLog" useGeneratedKeys="true" keyProperty="id">
-        insert into point_user_sign_log
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="userId != null">user_id,</if>
-            <if test="activityId != null">activity_id,</if>
-            <if test="taskId != null">task_id,</if>
-            <if test="signDate != null">sign_date,</if>
-            <if test="continuousDays != null">continuous_days,</if>
-            <if test="points != null">points,</if>
-            <if test="isMakeUp != null">is_make_up,</if>
-            <if test="createTime != null">create_time,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="userId != null">#{userId},</if>
-            <if test="activityId != null">#{activityId},</if>
-            <if test="taskId != null">#{taskId},</if>
-            <if test="signDate != null">#{signDate},</if>
-            <if test="continuousDays != null">#{continuousDays},</if>
-            <if test="points != null">#{points},</if>
-            <if test="isMakeUp != null">#{isMakeUp},</if>
-            <if test="createTime != null">#{createTime},</if>
-         </trim>
-    </insert>
-
-    <update id="updatePointUserSignLog" parameterType="PointUserSignLog">
-        update point_user_sign_log
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="userId != null">user_id = #{userId},</if>
-            <if test="activityId != null">activity_id = #{activityId},</if>
-            <if test="taskId != null">task_id = #{taskId},</if>
-            <if test="signDate != null">sign_date = #{signDate},</if>
-            <if test="continuousDays != null">continuous_days = #{continuousDays},</if>
-            <if test="points != null">points = #{points},</if>
-            <if test="isMakeUp != null">is_make_up = #{isMakeUp},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deletePointUserSignLogById" parameterType="String">
-        delete from point_user_sign_log where id = #{id}
-    </delete>
-
-    <delete id="deletePointUserSignLogByIds" parameterType="String">
-        delete from point_user_sign_log where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
 </mapper>

nightFragrance-massage/src/main/resources/mapper/point/PointUserSignStatusMapper.xml

@@ -15,71 +15,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
     </resultMap>
 
-    <sql id="selectPointUserSignStatusVo">
-        select id, user_id, activity_id, last_sign_date, current_continuous_days, max_historical_days, last_reward_cycle_days, update_time from point_user_sign_status
-    </sql>
-
-    <select id="selectPointUserSignStatusList" parameterType="PointUserSignStatus" resultMap="PointUserSignStatusResult">
-        <include refid="selectPointUserSignStatusVo"/>
-        <where>  
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="activityId != null "> and activity_id = #{activityId}</if>
-            <if test="lastSignDate != null "> and last_sign_date = #{lastSignDate}</if>
-            <if test="currentContinuousDays != null "> and current_continuous_days = #{currentContinuousDays}</if>
-            <if test="maxHistoricalDays != null "> and max_historical_days = #{maxHistoricalDays}</if>
-            <if test="lastRewardCycleDays != null "> and last_reward_cycle_days = #{lastRewardCycleDays}</if>
-        </where>
-    </select>
-    
-    <select id="selectPointUserSignStatusById" parameterType="String" resultMap="PointUserSignStatusResult">
-        <include refid="selectPointUserSignStatusVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertPointUserSignStatus" parameterType="PointUserSignStatus" useGeneratedKeys="true" keyProperty="id">
-        insert into point_user_sign_status
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="userId != null">user_id,</if>
-            <if test="activityId != null">activity_id,</if>
-            <if test="lastSignDate != null">last_sign_date,</if>
-            <if test="currentContinuousDays != null">current_continuous_days,</if>
-            <if test="maxHistoricalDays != null">max_historical_days,</if>
-            <if test="lastRewardCycleDays != null">last_reward_cycle_days,</if>
-            <if test="updateTime != null">update_time,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="userId != null">#{userId},</if>
-            <if test="activityId != null">#{activityId},</if>
-            <if test="lastSignDate != null">#{lastSignDate},</if>
-            <if test="currentContinuousDays != null">#{currentContinuousDays},</if>
-            <if test="maxHistoricalDays != null">#{maxHistoricalDays},</if>
-            <if test="lastRewardCycleDays != null">#{lastRewardCycleDays},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-         </trim>
-    </insert>
-
-    <update id="updatePointUserSignStatus" parameterType="PointUserSignStatus">
-        update point_user_sign_status
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="userId != null">user_id = #{userId},</if>
-            <if test="activityId != null">activity_id = #{activityId},</if>
-            <if test="lastSignDate != null">last_sign_date = #{lastSignDate},</if>
-            <if test="currentContinuousDays != null">current_continuous_days = #{currentContinuousDays},</if>
-            <if test="maxHistoricalDays != null">max_historical_days = #{maxHistoricalDays},</if>
-            <if test="lastRewardCycleDays != null">last_reward_cycle_days = #{lastRewardCycleDays},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deletePointUserSignStatusById" parameterType="String">
-        delete from point_user_sign_status where id = #{id}
-    </delete>
-
-    <delete id="deletePointUserSignStatusByIds" parameterType="String">
-        delete from point_user_sign_status where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
 </mapper>