Преглед на файлове

积分规则代码提交

wangzhijun преди 5 дни
родител
ревизия
52f3caad87
променени са 33 файла, в които са добавени 94 реда и са изтрити 1054 реда
  1. 6 0
      nightFragrance-massage/src/main/java/com/ylx/point/domain/PointActivityTask.java
  2. 3 0
      nightFragrance-massage/src/main/java/com/ylx/point/domain/dto/PointActivityTaskDTO.java
  3. 3 0
      nightFragrance-massage/src/main/java/com/ylx/point/domain/vo/PointActivityDetailsVo.java
  4. 3 0
      nightFragrance-massage/src/main/java/com/ylx/point/domain/vo/PointSignTaskVo.java
  5. 3 14
      nightFragrance-massage/src/main/java/com/ylx/point/mapper/PointActivityTaskMapper.java
  6. 4 44
      nightFragrance-massage/src/main/java/com/ylx/point/mapper/PointSignRewardMapper.java
  7. 2 1
      nightFragrance-massage/src/main/java/com/ylx/point/mapper/PointSignTaskMapper.java
  8. 4 39
      nightFragrance-massage/src/main/java/com/ylx/point/mapper/PointUserActivityTaskCompletionMapper.java
  9. 4 39
      nightFragrance-massage/src/main/java/com/ylx/point/mapper/PointUserLogMapper.java
  10. 4 39
      nightFragrance-massage/src/main/java/com/ylx/point/mapper/PointUserSignLogMapper.java
  11. 3 49
      nightFragrance-massage/src/main/java/com/ylx/point/mapper/PointUserSignStatusMapper.java
  12. 3 1
      nightFragrance-massage/src/main/java/com/ylx/point/service/IPointActivityService.java
  13. 2 1
      nightFragrance-massage/src/main/java/com/ylx/point/service/IPointActivityTaskService.java
  14. 2 1
      nightFragrance-massage/src/main/java/com/ylx/point/service/IPointSignRewardService.java
  15. 2 1
      nightFragrance-massage/src/main/java/com/ylx/point/service/IPointSignTaskService.java
  16. 3 49
      nightFragrance-massage/src/main/java/com/ylx/point/service/IPointUserActivityTaskCompletionService.java
  17. 3 51
      nightFragrance-massage/src/main/java/com/ylx/point/service/IPointUserLogService.java
  18. 3 51
      nightFragrance-massage/src/main/java/com/ylx/point/service/IPointUserSignLogService.java
  19. 3 51
      nightFragrance-massage/src/main/java/com/ylx/point/service/IPointUserSignStatusService.java
  20. 3 3
      nightFragrance-massage/src/main/java/com/ylx/point/service/impl/PointActivityServiceImpl.java
  21. 2 1
      nightFragrance-massage/src/main/java/com/ylx/point/service/impl/PointActivityTaskServiceImpl.java
  22. 2 1
      nightFragrance-massage/src/main/java/com/ylx/point/service/impl/PointSignRewardServiceImpl.java
  23. 2 1
      nightFragrance-massage/src/main/java/com/ylx/point/service/impl/PointSignTaskServiceImpl.java
  24. 5 80
      nightFragrance-massage/src/main/java/com/ylx/point/service/impl/PointUserActivityTaskCompletionServiceImpl.java
  25. 5 79
      nightFragrance-massage/src/main/java/com/ylx/point/service/impl/PointUserLogServiceImpl.java
  26. 3 74
      nightFragrance-massage/src/main/java/com/ylx/point/service/impl/PointUserSignLogServiceImpl.java
  27. 3 74
      nightFragrance-massage/src/main/java/com/ylx/point/service/impl/PointUserSignStatusServiceImpl.java
  28. 7 3
      nightFragrance-massage/src/main/resources/mapper/point/PointActivityTaskMapper.xml
  29. 2 0
      nightFragrance-massage/src/main/resources/mapper/point/PointSignTaskMapper.xml
  30. 0 74
      nightFragrance-massage/src/main/resources/mapper/point/PointUserActivityTaskCompletionMapper.xml
  31. 0 95
      nightFragrance-massage/src/main/resources/mapper/point/PointUserLogMapper.xml
  32. 0 71
      nightFragrance-massage/src/main/resources/mapper/point/PointUserSignLogMapper.xml
  33. 0 67
      nightFragrance-massage/src/main/resources/mapper/point/PointUserSignStatusMapper.xml

+ 6 - 0
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;
+
 }

+ 3 - 0
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;
+
 }

+ 3 - 0
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) {

+ 3 - 0
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;
 

+ 3 - 14
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,26 +12,14 @@ 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);

+ 4 - 44
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);
 }

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

@@ -1,5 +1,6 @@
 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;
 
@@ -9,7 +10,7 @@ import com.ylx.point.domain.vo.PointSignTaskVo;
  * @author wzj
  * @date 2026-03-25
  */
-public interface PointSignTaskMapper {
+public interface PointSignTaskMapper extends BaseMapper<PointSignTask> {
 
     public int deletePointSignTaskById(String id);
 

+ 4 - 39
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);
 }

+ 4 - 39
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);
 }

+ 4 - 39
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);
 }

+ 3 - 49
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);
 }

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

@@ -1,5 +1,7 @@
 package com.ylx.point.service;
 
+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;
 import com.ylx.point.domain.dto.PointActivityValidityDTO;
@@ -15,7 +17,7 @@ import java.util.List;
  * @author wzj
  * @date 2026-03-25
  */
-public interface IPointActivityService {
+public interface IPointActivityService extends IService<PointActivity> {
 
     List<PointActivityPageVo> list(PointActivityPageDTO dto);
 

+ 2 - 1
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,7 +12,7 @@ import java.util.List;
  * @author wzj
  * @date 2026-03-25
  */
-public interface IPointActivityTaskService {
+public interface IPointActivityTaskService extends IService<PointActivityTask> {
 
     List<PointActivityTaskDTO>  selectPointActivityTaskByActivityId(Long id);
 

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

@@ -1,5 +1,6 @@
 package com.ylx.point.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ylx.point.domain.PointSignReward;
 
 import java.util.List;
@@ -10,7 +11,7 @@ import java.util.List;
  * @author wzj
  * @date 2026-03-25
  */
-public interface IPointSignRewardService {
+public interface IPointSignRewardService extends IService<PointSignReward> {
 
     /**
      * 查询签到动态奖励配置列表

+ 2 - 1
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> {
 
 
     /**

+ 3 - 49
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);
 }

+ 3 - 51
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);
 }

+ 3 - 51
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);
 }

+ 3 - 51
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);
 }

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

@@ -118,7 +118,7 @@ public class PointActivityServiceImpl extends ServiceImpl<PointActivityMapper, P
         }
 
         // 更新活动信息
-        entity = createActivityEntity(dto);
+        BeanUtil.copyProperties(dto, entity);
         updateActivity(entity);
 
         // 更新活动详情信息
@@ -337,7 +337,7 @@ public class PointActivityServiceImpl extends ServiceImpl<PointActivityMapper, P
 
         // 更新签到任务基本信息
         PointSignTask pointSignTask = new PointSignTask();
-        pointSignTask.setId(existingTask.getId());
+        pointSignTask.setId(existingTask.getSignTaskId());
         pointSignTask.setBasePoints(signTaskDTO.getBasePoints());
         pointSignTask.setBreakRule(signTaskDTO.getBreakRule());
 
@@ -348,7 +348,7 @@ public class PointActivityServiceImpl extends ServiceImpl<PointActivityMapper, P
         }
 
         // 更新签到奖励配置
-        updateSignRewards(signTaskDTO.getSignRewardList(), existingTask.getId());
+        updateSignRewards(signTaskDTO.getSignRewardList(), pointSignTask.getId());
     }
 
     /**

+ 2 - 1
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;
@@ -22,7 +23,7 @@ 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;
 

+ 2 - 1
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,7 +20,7 @@ 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;
 

+ 2 - 1
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;
 

+ 5 - 80
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);
-    }
 }

+ 5 - 79
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);
-    }
 }

+ 3 - 74
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);
-    }
 }

+ 3 - 74
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);
-    }
 }

+ 7 - 3
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>

+ 2 - 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"/>
         <!-- 关联奖励列表 -->
@@ -47,6 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getTaskWithRewards" resultMap="PointSignTaskMap">
         SELECT
+            t.id AS signTaskId,
             t.base_points,
             t.break_rule,
             r.reward_points,

+ 0 - 74
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>

+ 0 - 95
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>

+ 0 - 71
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>

+ 0 - 67
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>