Просмотр исходного кода

feat(task): 超期任务允许打卡完成但零奖励(产品拍板:过期可打卡只是不发 CF 值)

- 删除 TC-C-02-E 硬拦截:超期任务不再抛 IllegalArgumentException
- awardTaskCompletionRewards 增 isOverdue(截止后超宽限期 LATE_GRACE_MINUTES=10 分钟)零奖励分支:
  完成置 completed、连续打卡照常、解锁后置任务,但不发积分/能量/CF/里程碑
- completeTask result 增 overdue 标记供前端提示
- 直接完成与审核通过(applyReviewDecision→awardTaskCompletionRewards)两条路径一致生效
- 契约测试改写:超期提交→允许完成零奖励 + 新增宽限期内照常发奖用例(12/12 GREEN)
Xiaogang Liao 12 часов назад
Родитель
Сommit
6dc13d0727

+ 48 - 19
cfc-backend/src/main/java/com/etotem/cfc/service/TaskService.java

@@ -770,11 +770,9 @@ public List<Task> getTodayTasks(Long memberId, String dimensionCode) {
             return buildIdempotentCompleteResult(task, memberId);
             return buildIdempotentCompleteResult(task, memberId);
         }
         }
 
 
-        // TC-C-02-E:超期任务提交必须被拒(deadline 守卫)——截止时间已过则不允许完成、不发奖。
-        // 不修改任务、不写积分流水,直接抛异常由上游转错误提示(杜绝"迟到扣分"式静默完成)。
-        if (task.getDeadline() != null && task.getDeadline().before(new Date())) {
-            throw new IllegalArgumentException("任务已过截止时间,无法提交完成");
-        }
+        // TC-C-02-E 修订(2026-11-16 产品拍板:过期任务可打卡但零奖励):
+        // 不再在此硬拦截——超期任务允许完成(状态置 completed、连续打卡照常),奖励是否发放由
+        // awardTaskCompletionRewards 按 isOverdue 统一裁剪(直接完成与审核通过两条路径一致)。
 
 
         // TASK-SYS-248: 前置任务校验——前置未完成则拒绝
         // TASK-SYS-248: 前置任务校验——前置未完成则拒绝
         if (task.getPrerequisiteTaskId() != null) {
         if (task.getPrerequisiteTaskId() != null) {
@@ -840,6 +838,7 @@ public List<Task> getTodayTasks(Long memberId, String dimensionCode) {
         result.put("pointsEarned", pointsEarned);
         result.put("pointsEarned", pointsEarned);
         result.put("newBalance", child != null ? child.getTotalPoints() : 0);
         result.put("newBalance", child != null ? child.getTotalPoints() : 0);
         result.put("needReview", false);
         result.put("needReview", false);
+        result.put("overdue", isOverdue(task, now));
         try {
         try {
             com.etotem.cfc.entity.TaskReminderConfig cfg = taskReminderConfigService.loadAllConfigs().get(task.getExecutorId());
             com.etotem.cfc.entity.TaskReminderConfig cfg = taskReminderConfigService.loadAllConfigs().get(task.getExecutorId());
             if (cfg != null && Integer.valueOf(1).equals(cfg.getCompletionPraiseEnabled())) {
             if (cfg != null && Integer.valueOf(1).equals(cfg.getCompletionPraiseEnabled())) {
@@ -1209,6 +1208,13 @@ public List<Task> getTodayTasks(Long memberId, String dimensionCode) {
             return 0;
             return 0;
         }
         }
 
 
+        // 2026-11-16 产品修订:任务超期(截止后超过宽限期)允许打卡完成,但零奖励——
+        // 不发积分/能量/CF/里程碑;仍置 completed 并更新连续打卡。直接完成与审核通过均经此路径。
+        if (isOverdue(task, completionTime)) {
+            completeTaskWithoutRewards(task, child, completionTime);
+            return 0;
+        }
+
         String bonusRuleJson = task.getBonusRule();
         String bonusRuleJson = task.getBonusRule();
         if (bonusRuleJson != null && !bonusRuleJson.isEmpty()) {
         if (bonusRuleJson != null && !bonusRuleJson.isEmpty()) {
             pointsEarned = calculatePointsWithBonusRule(task, completionTime, isEarly, isLateGrace, child);
             pointsEarned = calculatePointsWithBonusRule(task, completionTime, isEarly, isLateGrace, child);
@@ -1225,20 +1231,7 @@ public List<Task> getTodayTasks(Long memberId, String dimensionCode) {
 
 
         child.setTotalPoints(child.getTotalPoints() + pointsEarned);
         child.setTotalPoints(child.getTotalPoints() + pointsEarned);
 
 
-        Date lastTaskDate = child.getLastTaskDate();
-        Date today = new Date();
-        Calendar cal = Calendar.getInstance();
-        cal.add(Calendar.DAY_OF_MONTH, -1);
-        Date yesterday = cal.getTime();
-
-        if (lastTaskDate == null || lastTaskDate.before(yesterday)) {
-            child.setStreakDays(1);
-        } else if (!isSameDay(lastTaskDate, today)) {
-            child.setStreakDays(child.getStreakDays() + 1);
-        }
-        child.setLastTaskDate(today);
-        child.setUpdatedAt(new Date());
-        familyMemberMapper.updateById(child);
+        updateStreakAfterCompletion(child);
 
 
         int milestoneReward = streakService.checkAndAwardMilestone(memberId, child.getStreakDays());
         int milestoneReward = streakService.checkAndAwardMilestone(memberId, child.getStreakDays());
         if (milestoneReward > 0) {
         if (milestoneReward > 0) {
@@ -1307,6 +1300,42 @@ public List<Task> getTodayTasks(Long memberId, String dimensionCode) {
         return pointsEarned;
         return pointsEarned;
     }
     }
 
 
+    /** 2026-11-16 产品修订:任务超期判定——截止时间已过且超过宽限期(LATE_GRACE_MINUTES)视为超期 */
+    private boolean isOverdue(Task task, Date completionTime) {
+        if (task.getDeadline() == null) return false;
+        if (completionTime.before(task.getDeadline())) return false;
+        long diffMinutes = (completionTime.getTime() - task.getDeadline().getTime()) / (1000 * 60);
+        return diffMinutes > LATE_GRACE_MINUTES;
+    }
+
+    /** 超期完成:允许打卡但零奖励——置 completed、更新连续打卡、解锁后置任务,不发任何奖励 */
+    private void completeTaskWithoutRewards(Task task, FamilyMember child, Date completionTime) {
+        task.setStatus("completed");
+        task.setCompletedAt(completionTime);
+        task.setUpdatedAt(new Date());
+        taskMapper.updateById(task);
+        updateStreakAfterCompletion(child);
+        unlockPrerequisiteTasks(task.getId());
+    }
+
+    /** 打卡成功后更新连续打卡(发奖与超期零奖励共用) */
+    private void updateStreakAfterCompletion(FamilyMember child) {
+        Date lastTaskDate = child.getLastTaskDate();
+        Date today = new Date();
+        Calendar cal = Calendar.getInstance();
+        cal.add(Calendar.DAY_OF_MONTH, -1);
+        Date yesterday = cal.getTime();
+
+        if (lastTaskDate == null || lastTaskDate.before(yesterday)) {
+            child.setStreakDays(1);
+        } else if (!isSameDay(lastTaskDate, today)) {
+            child.setStreakDays(child.getStreakDays() + 1);
+        }
+        child.setLastTaskDate(today);
+        child.setUpdatedAt(new Date());
+        familyMemberMapper.updateById(child);
+    }
+
     private void recordTaskExecution(Task task, Long memberId, Date now, String content, String contentType) {
     private void recordTaskExecution(Task task, Long memberId, Date now, String content, String contentType) {
         Long taskId = task.getId();
         Long taskId = task.getId();
         try {
         try {

+ 32 - 11
cfc-backend/src/test/java/com/etotem/cfc/unit/TaskCompleteScC02ContractTest.java

@@ -75,6 +75,7 @@ class TaskCompleteScC02ContractTest {
     private TaskService service;
     private TaskService service;
     private TaskController controller;
     private TaskController controller;
     private TaskService taskServiceMock; // controller 层转发的 mock(与 service 层真实实例隔离)
     private TaskService taskServiceMock; // controller 层转发的 mock(与 service 层真实实例隔离)
+    private CfPathwayEarnService cfPathwayEarnService;
 
 
     private TaskMapper taskMapper;
     private TaskMapper taskMapper;
     private FamilyMemberMapper familyMemberMapper;
     private FamilyMemberMapper familyMemberMapper;
@@ -95,7 +96,7 @@ class TaskCompleteScC02ContractTest {
         taskExecutionMapper = mock(TaskExecutionMapper.class);
         taskExecutionMapper = mock(TaskExecutionMapper.class);
         streakService = mock(StreakService.class);
         streakService = mock(StreakService.class);
         EnergyService energyService = mock(EnergyService.class);
         EnergyService energyService = mock(EnergyService.class);
-        CfPathwayEarnService cfPathwayEarnService = mock(CfPathwayEarnService.class);
+        cfPathwayEarnService = mock(CfPathwayEarnService.class);
         TaskReminderConfigService taskReminderConfigService = mock(TaskReminderConfigService.class);
         TaskReminderConfigService taskReminderConfigService = mock(TaskReminderConfigService.class);
         NotificationDispatchService notificationDispatchService = mock(NotificationDispatchService.class);
         NotificationDispatchService notificationDispatchService = mock(NotificationDispatchService.class);
 
 
@@ -198,23 +199,43 @@ class TaskCompleteScC02ContractTest {
     // ==================== 异常流(TC-C-02-E) ====================
     // ==================== 异常流(TC-C-02-E) ====================
 
 
     @Test
     @Test
-    @DisplayName("异常流-1:超期任务仍提交应被拒(RED:deadline 守卫缺失)")
-    void c02e_异常流_超期任务提交_应被拒() {
-        // 截止时间已过 1 小时,任务仍为 pending
+    @DisplayName("异常流-1:超期任务(超过宽限期)提交 → 允许完成、写入记录、连续打卡,但零奖励(产品拍板:过期可打卡只是不发 CF 值)")
+    void c02e_异常流_超期任务提交_允许完成但不发奖励() {
+        // 截止时间已过 1 小时(超过 LATE_GRACE_MINUTES=10 分钟宽限),任务仍为 pending
         Task t = task(99L, 100L, "pending", 0, new Date(System.currentTimeMillis() - 3_600_000L));
         Task t = task(99L, 100L, "pending", 0, new Date(System.currentTimeMillis() - 3_600_000L));
         when(taskMapper.selectById(99L)).thenReturn(t);
         when(taskMapper.selectById(99L)).thenReturn(t);
         when(familyMemberMapper.selectById(100L)).thenReturn(member(100L, 20, 0));
         when(familyMemberMapper.selectById(100L)).thenReturn(member(100L, 20, 0));
 
 
-        // 契约(TC-C-02-E):超期任务仍提交 → 被拒(不允许完成、不得发奖)。
-        // 现状:无 deadline 守卫,走"迟到扣分"完成链路 → 断言失败(红)。
-        assertThrows(IllegalArgumentException.class,
-                () -> service.completeTask(99L, 100L, null, "逾期补交", "text"),
-                "[task.task.complete] 超期任务提交必须被拒(TC-C-02-E):当前实现无超期守卫,"
-                        + "仍在完成并发奖。GREEN 阶段应在 completeTask 补 deadline 拦截。");
-        verify(taskMapper, never()).updateById(any(Task.class));
+        // 新契约(2026-11-16 产品修订):超期不再拒绝,允许打卡完成(status=completed、连续打卡照常),
+        // 但零奖励:不发积分、不写积分流水、不动余额、不发 CF/能量/里程碑。
+        Map<String, Object> result = service.completeTask(99L, 100L, null, "逾期补交", "text");
+
+        assertEquals(0, result.get("pointsEarned"), "超期完成不得发奖励");
+        assertEquals(20, result.get("newBalance"), "余额不得变化");
+        assertEquals(Boolean.FALSE, result.get("needReview"));
+        assertEquals(Boolean.TRUE, result.get("overdue"), "应标记 overdue 供前端提示");
+        assertEquals("completed", t.getStatus(), "超期任务应允许完成");
+        assertTrue(t.getCompletedAt() != null, "应写入完成时间");
+        verify(taskMapper).updateById(t);
+        verify(taskExecutionMapper).insert(any(TaskExecution.class)); // 执行记录照常写入
+        verify(familyMemberMapper).updateById(any(FamilyMember.class)); // 连续打卡照常更新
         verify(pointsLogMapper, never()).insert(any(PointsLog.class));
         verify(pointsLogMapper, never()).insert(any(PointsLog.class));
     }
     }
 
 
+    @Test
+    @DisplayName("异常流-1b:宽限期内(<=10 分钟)完成 → 仍视为按时完成照常发奖不视为超期")
+    void c02e_宽限期内完成_照常发奖不视为超期() {
+        Task t = task(97L, 100L, "pending", 0, new Date(System.currentTimeMillis() - 5 * 60_000L));
+        when(taskMapper.selectById(97L)).thenReturn(t);
+        when(familyMemberMapper.selectById(100L)).thenReturn(member(100L, 20, 0));
+
+        Map<String, Object> result = service.completeTask(97L, 100L, null, "宽限打卡", "text");
+
+        assertEquals(11, result.get("pointsEarned"), "宽限期内应得 points+EARLY_BONUS");
+        assertEquals(31, result.get("newBalance"), "余额应正常增加");
+        assertEquals("completed", t.getStatus());
+    }
+
     @Test
     @Test
     @DisplayName("异常流-2:任务不存在 → 返回 null(上游转错误提示,杜绝静默成功)")
     @DisplayName("异常流-2:任务不存在 → 返回 null(上游转错误提示,杜绝静默成功)")
     void c02_异常流_任务不存在_返回null() {
     void c02_异常流_任务不存在_返回null() {