From 7564af8220eeafc70f7ed0bd5a7a7cf85717f937 Mon Sep 17 00:00:00 2001
From: cjy <zczhyx2345@outlook.com>
Date: Tue, 27 Jan 2026 13:24:35 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=A6=82=E6=9E=9C=E6=96=B0?=
 =?UTF-8?q?=E4=B9=B0=E4=B8=80=E4=B8=AA=E5=A5=97=E9=A4=90=EF=BC=8C=E5=8E=9F?=
 =?UTF-8?q?=E6=9C=89=E5=A5=97=E9=A4=90=E7=9A=84=E7=9B=B4=E6=8E=A5=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=EF=BC=8C=E4=B8=8D=E9=9C=80=E8=A6=81=E6=B6=88=E8=80=97?=
 =?UTF-8?q?=E9=A2=9D=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/service/cast/analysis.go | 26 ++++++++++++++++++++++++++
 pkg/service/cast/report.go   | 25 +++++++++++++++++++++++++
 2 files changed, 51 insertions(+)

diff --git a/pkg/service/cast/analysis.go b/pkg/service/cast/analysis.go
index c6843b7..458f2dd 100644
--- a/pkg/service/cast/analysis.go
+++ b/pkg/service/cast/analysis.go
@@ -660,6 +660,32 @@ func autoConfirmAnalysis(ctx context.Context, analysisUuid string) (err error) {
 		}
 		return
 	}
+	// 判断数据分析的提交时间是否在现在的套餐期间范围之内
+	submitTime, err := time.Parse("2006-01-02 15:04:05", infoResp.SubmitTime)
+	if err != nil {
+		zap.L().Error("autoConfirmAnalysis ParseSubmitTime", zap.Any("err", err))
+		return
+	}
+	if submitTime.Before(time.Unix(balanceInfoRes.PayTime, 0)) {
+		// todo 暂时先这样
+		// confirmRemark = "该报告提交时间不在该套餐期间范围之内"
+		// 直接提交
+		confirmRemark = "系统自动确认"
+		usedType = 0
+		_, err = service.CastProvider.UpdateWorkAnalysisStatus(context.Background(), &cast.UpdateWorkAnalysisStatusReq{
+			WorkAction:    cast.WorkActionENUM_CONFIRM,
+			Uuid:          analysisUuid,
+			ConfirmRemark: confirmRemark,
+			CostType:      usedType,
+			ConfirmStatus: 1,
+			ConfirmType:   2,
+		})
+		if err != nil {
+			zap.L().Error("autoConfirmAnalysis UpdateWorkAnalysisStatus", zap.Any("err", err))
+			return
+		}
+		return
+	}
 
 	var addBalanceReq bundle.AddBundleBalanceReq
 	addBalanceReq.UserId = int32(userID)
diff --git a/pkg/service/cast/report.go b/pkg/service/cast/report.go
index 2fcac72..e2a766d 100644
--- a/pkg/service/cast/report.go
+++ b/pkg/service/cast/report.go
@@ -1014,6 +1014,31 @@ func autoConfirmReport(ctx context.Context, reportUuid string) (err error) {
 		}
 		return
 	}
+	// 判断竞品报告的提交时间是否在现在的套餐期间范围之内
+	submitTime, err := time.Parse("2006-01-02 15:04:05", infoResp.SubmitTime)
+	if err != nil {
+		zap.L().Error("autoConfirmReport ParseSubmitTime", zap.Any("err", err))
+		return
+	}
+	if submitTime.Before(time.Unix(balanceInfoRes.PayTime, 0)) {
+		// confirmRemark = "该报告提交时间不在该套餐期间范围之内"
+		confirmRemark = "系统自动确认"
+		usedType = 0
+		// 直接提交
+		_, err = service.CastProvider.UpdateCompetitiveReportStatus(context.Background(), &cast.UpdateCompetitiveReportStatusReq{
+			WorkAction:    cast.WorkActionENUM_CONFIRM,
+			Uuid:          reportUuid,
+			ConfirmRemark: confirmRemark,
+			CostType:      usedType,
+			ConfirmStatus: 1,
+			ConfirmType:   2,
+		})
+		if err != nil {
+			zap.L().Error("autoConfirmReport UpdateCompetitiveReportStatus", zap.Any("err", err))
+			return
+		}
+		return
+	}
 
 	var addBalanceReq bundle.AddBundleBalanceReq
 	addBalanceReq.UserId = int32(userID)