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

2026-03-04 00:59:12 +08:00
parent 4509ebea60
commit bdd34785ef
6 changed files with 13 additions and 8 deletions
@@ -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)