修复戒烟首页与统计中抽烟/忍住口径混淆

internal/smoke/handler/smoke_handler.go

@@ -78,6 +78,10 @@ func (h *SmokeHandler) Create(c *gin.Context) {
 		}
 		num = *req.Num
 	}
+	if num == 0 {
+		c.JSON(http.StatusBadRequest, model.Error(http.StatusBadRequest, "num=0 请使用 /api/v1/smoke/logs/resisted"))
+		return
+	}
 
 	if level < 0 || num < 0 {
 		c.JSON(http.StatusBadRequest, model.Error(http.StatusBadRequest, "level/num 不能为负数"))

internal/smoke/service/smoke_ai_next_smoke_service.go

@@ -494,7 +494,7 @@ func (s *SmokeAINextSmokeService) loadRecent3Days(ctx context.Context, uid int,
 		}
 		snap := ensure(day)
 
-		isResisted := l.Num == 0
+		isResisted := l.Level == 0 && l.Num == 0
 		if isResisted {
 			snap.ResistedCount++
 		} else if l.Num > 0 {

internal/smoke/service/smoke_log_service.go

@@ -163,7 +163,7 @@ func (s *SmokeLogService) List(ctx context.Context, uid int, req ListSmokeLogsRe
 	case "smoke":
 		tx = tx.Where("num > 0")
 	case "resisted":
-		tx = tx.Where("num = 0")
+		tx = tx.Where("level = 0 AND num = 0")
 	}
 
 	var total int64
@@ -287,7 +287,7 @@ func (s *SmokeLogService) HomeSummary(ctx context.Context, uid int, asOf time.Ti
 	if err := s.db.WithContext(ctx).
 		Model(&smokemodel.SmokeLog{}).
 		Where("uid = ? AND (deletetime IS NULL OR deletetime = 0)", uid).
-		Where("num = 0 AND smoke_time = ?", todayKey).
+		Where("level = 0 AND num = 0 AND smoke_time = ?", todayKey).
 		Count(&resistedCount).Error; err != nil {
 		return SmokeHomeSummary{}, fmt.Errorf("count resisted logs: %w", err)
 	}

internal/smoke/service/smoke_next_service.go

@@ -170,7 +170,7 @@ func (s *SmokeNextService) countResistedLastDays(ctx context.Context, uid int, d
 	if err := s.db.WithContext(ctx).
 		Model(&smokemodel.SmokeLog{}).
 		Where("uid = ? AND (deletetime IS NULL OR deletetime = 0)", uid).
-		Where("num = 0").
+		Where("level = 0 AND num = 0").
 		Where("smoke_time BETWEEN ? AND ?", start.Format("2006-01-02"), end.Format("2006-01-02")).
 		Count(&count).Error; err != nil {
 		return 0, fmt.Errorf("count resisted logs: %w", err)

internal/smoke/service/smoke_stats_service.go

@@ -244,7 +244,7 @@ func (s *SmokeLogService) countResisted(ctx context.Context, uid int, start, end
 	if err := s.db.WithContext(ctx).
 		Model(&smokemodel.SmokeLog{}).
 		Where("uid = ? AND (deletetime IS NULL OR deletetime = 0)", uid).
-		Where("num = 0").
+		Where("level = 0 AND num = 0").
 		Where("smoke_time BETWEEN ? AND ?", start.Format("2006-01-02"), end.Format("2006-01-02")).
 		Count(&count).Error; err != nil {
 		return 0, fmt.Errorf("count resisted: %w", err)