修正数据

internal/service/iot_card/stop_resume_service.go

@@ -195,18 +195,23 @@ func (s *StopResumeService) isTrafficExhausted(ctx context.Context, card *model.
 		}
 	}
 
-	pkg, err := s.packageUsageStore.GetActiveOrDepletedByCarrier(ctx, carrierType, carrierID)
+	packages, err := s.packageUsageStore.ListActiveOrDepletedByCarrier(ctx, carrierType, carrierID)
 	if err != nil {
-		if stderrors.Is(err, gorm.ErrRecordNotFound) {
-			return false, nil
-		}
 		return false, err
 	}
-
-	if pkg.Status == constants.PackageUsageStatusDepleted {
-		return true, nil
+	if len(packages) == 0 {
+		return false, nil
 	}
-	return pkg.DataLimitMB > 0 && pkg.DataUsageMB >= pkg.DataLimitMB, nil
+
+	for _, pkg := range packages {
+		if pkg == nil {
+			continue
+		}
+		if !pkg.IsTrafficDepleted() {
+			return false, nil
+		}
+	}
+	return true, nil
 }
 
 // isRealnameOK 检查卡是否满足实名要求
@@ -221,16 +226,7 @@ func (s *StopResumeService) isRealnameOK(card *model.IotCard) bool {
 func (s *StopResumeService) checkStopReasons(ctx context.Context, card *model.IotCard) ([]string, error) {
 	var reasons []string
 
-	// 条件A：无有效套餐（优先级最高）
-	hasPackage, err := s.hasValidPackage(ctx, card)
-	if err != nil {
-		return nil, err
-	}
-	if !hasPackage {
-		reasons = append(reasons, constants.StopReasonNoPackage)
-	}
-
-	// 条件B：虚流量耗尽
+	// 条件A：流量耗尽
 	exhausted, err := s.isTrafficExhausted(ctx, card)
 	if err != nil {
 		return nil, err
@@ -239,6 +235,15 @@ func (s *StopResumeService) checkStopReasons(ctx context.Context, card *model.Io
 		reasons = append(reasons, constants.StopReasonTrafficExhausted)
 	}
 
+	// 条件B：无有效套餐（仅在未命中流量耗尽时判断）
+	hasPackage, err := s.hasValidPackage(ctx, card)
+	if err != nil {
+		return nil, err
+	}
+	if !hasPackage && !exhausted {
+		reasons = append(reasons, constants.StopReasonNoPackage)
+	}
+
 	// 条件C：非行业卡且未实名
 	if !s.isRealnameOK(card) {
 		reasons = append(reasons, constants.StopReasonNotRealname)