wangzhijun 2 дней назад
Родитель
Сommit
94a863a8fb

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

@@ -1,5 +1,6 @@
 package com.ylx.point.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.ylx.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -89,4 +90,10 @@ public class PointActivityTask extends BaseEntity {
     @Excel(name = "状态: 0=启用, 1=弃用")
     private Integer status;
 
+
+    @TableField(exist = false)
+    private String createBy;
+
+    @TableField(exist = false)
+    private String updateBy;
 }

+ 3 - 0
nightFragrance-massage/src/main/java/com/ylx/point/domain/vo/UserPointActivityVo.java

@@ -11,6 +11,9 @@ public class UserPointActivityVo {
     @ApiModelProperty("关联活动ID")
     private Long activityId;
 
+    @ApiModelProperty("任务ID")
+    private String taskId;
+
     @ApiModelProperty("任务名称")
     private String taskName;
 

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

@@ -598,6 +598,7 @@ public class PointActivityServiceImpl extends ServiceImpl<PointActivityMapper, P
         UserPointActivityVo vo = new UserPointActivityVo();
 
         vo.setActivityId(task.getActivityId());
+        vo.setTaskId(task.getId().toString());
         vo.setTaskName(task.getTaskName()); // 或者是从字典表查出的中文名称
         vo.setRewardPoints(task.getRewardPoints());
 

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

@@ -233,8 +233,6 @@ public class PointUserActivityTaskCompletionServiceImpl extends ServiceImpl<Poin
             // 为了简单,假设这里调用 addPoints 是安全的(或者你在 addPoints 内部做幂等)
             pointAccountService.addPoints(openId, task.getRewardPoints().intValue(), activity.getName(), null, activityId, taskId, taskType.getCode());
 
-        } else {
-            throw new ServiceException("未检测到符合条件的记录,请先完成任务(如支付订单、充值等)");
         }
     }