修改线上配置文件redis配置

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

@@ -5,6 +5,7 @@ import com.ylx.common.core.controller.BaseController;
 import com.ylx.common.core.domain.R;
 import com.ylx.point.domain.PointActivity;
 import com.ylx.point.domain.PointUserLog;
+import com.ylx.point.domain.dto.CompleteTaskDTO;
 import com.ylx.point.domain.dto.UserPointActivityPageDTO;
 import com.ylx.point.domain.dto.UserPointPageDTO;
 import com.ylx.point.domain.vo.UserPointActivityVo;
@@ -15,6 +16,7 @@ import com.ylx.point.service.IPointUserActivityTaskCompletionService;
 import com.ylx.point.service.IPointUserLogService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -34,6 +36,7 @@ public class UserPointController extends BaseController {
 
     /**
      * 获取当前用户的积分信息
+     *
      * @param cityCode
      * @return R<UserPointInfoVO>
      */
@@ -67,9 +70,9 @@ public class UserPointController extends BaseController {
 
     @ApiOperation("用户点击“去完成”接口")
     @PostMapping("/complete")
-    public R completeTask(@RequestParam Long taskId) {
-            this.pointUserActivityTaskCompletionService.executeTask(taskId);
-            return R.ok();
+    public R completeTask(@Validated @RequestBody CompleteTaskDTO dto) {
+        this.pointUserActivityTaskCompletionService.executeTask(dto.getTaskId());
+        return R.ok();
     }
 
 }

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

@@ -0,0 +1,17 @@
+package com.ylx.point.domain.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ApiModel("积分活动完成DTO")
+public class CompleteTaskDTO {
+
+    @NotNull(message = "活动主键id不能为空")
+    @ApiModelProperty(value = "活动主键id", required = true)
+    private Long taskId;
+
+}

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

@@ -165,7 +165,7 @@ public class PointUserActivityTaskCompletionServiceImpl extends ServiceImpl<Poin
 
         // 场景 A: 每日任务/签到 -> 只需要检查今天是否做过
         if (pointActivityType == PointActivityTypeEnum.SIGN_TASK || pointActivityType == PointActivityTypeEnum.DAILY_ACTIVITY) {
-            boolean completed = this.isTodayCompleted(openId, activityId, taskId, activityType);
+            boolean completed = this.isTodayCompleted(openId, activityId, taskId, taskType.getCode());
             if (completed) {
                 throw new ServiceException("今日任务已完成，请勿重复领取");
             }
@@ -214,6 +214,7 @@ public class PointUserActivityTaskCompletionServiceImpl extends ServiceImpl<Poin
                             .eq(PointUserActivityTaskCompletion::getOpenId, openId)
                             .eq(PointUserActivityTaskCompletion::getTaskId, taskId)
                             .eq(PointUserActivityTaskCompletion::getActivityId, activityId)
+                            .eq(PointUserActivityTaskCompletion::getTaskType, taskType.getCode())
             );
 
             // 防刷：如果已经达标，不再重复发分