team/tyapi-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: team:7fdfa021894897fcb299134278e04deaf59416ca
Branches Tags
team:main team:report-routes
...
compare: team:6b902f68f12805b2d6f9b30df45470afe4e8e31a
Branches Tags
team:main team:report-routes

3 Commits
7fdfa02189 ... 6b902f68f1

Author SHA1 Message Date
18278715334
6b902f68f1 Merge branch 'main' of http://1.117.67.95:3000/team/tyapi-server 2026-01-14 16:00:32 +08:00
18278715334
745fbc05d5 f 2026-01-14 16:00:27 +08:00
18278715334
6618e35869 -f 2026-01-14 15:59:15 +08:00
3 changed files with 75 additions and 65 deletions
Expand all files Collapse all files

45
internal/application/product/component_report_order_service.go
View File

@@ -565,13 +565,14 @@ func (s *ComponentReportOrderService) createFreeOrder(
// 创建下载记录 // 创建下载记录
download := &productEntities.ComponentReportDownload{ download := &productEntities.ComponentReportDownload{
UserID: req.UserID, UserID: req.UserID,
ProductID: req.ProductID, ProductID: req.ProductID,
ProductCode: product.Code, ProductCode: product.Code,
ProductName: product.Name, ProductName: product.Name,
OrderID: &createdPurchaseOrder.ID, // 关联购买订单ID OrderID: &createdPurchaseOrder.ID, // 关联购买订单ID
OrderNumber: &createdPurchaseOrder.OrderNo, // 外部订单号 OrderNumber: &createdPurchaseOrder.OrderNo, // 外部订单号
ExpiresAt: calculateExpiryTime(), // 30天后过期 DownloadPrice: finalPrice, // 设置下载价格
ExpiresAt: calculateExpiryTime(), // 30天后过期
} }
err = s.componentReportRepo.Create(ctx, download) err = s.componentReportRepo.Create(ctx, download)
@@ -779,13 +780,14 @@ func (s *ComponentReportOrderService) DownloadFile(ctx context.Context, orderID
// 创建新的下载记录 // 创建新的下载记录
newDownload := &productEntities.ComponentReportDownload{ newDownload := &productEntities.ComponentReportDownload{
UserID: purchaseOrder.UserID, UserID: purchaseOrder.UserID,
ProductID: purchaseOrder.ProductID, ProductID: purchaseOrder.ProductID,
ProductCode: product.Code, ProductCode: product.Code,
ProductName: product.Name, ProductName: product.Name,
OrderID: &purchaseOrder.ID, OrderID: &purchaseOrder.ID,
OrderNumber: &purchaseOrder.OrderNo, OrderNumber: &purchaseOrder.OrderNo,
ExpiresAt: calculateExpiryTime(), DownloadPrice: purchaseOrder.Amount, // 设置下载价格（从订单获取）
ExpiresAt: calculateExpiryTime(),
} }
// 保存下载记录 // 保存下载记录
@@ -918,13 +920,14 @@ func (s *ComponentReportOrderService) createDownloadRecordForPaidOrder(ctx conte
// 创建新的下载记录 // 创建新的下载记录
download := &productEntities.ComponentReportDownload{ download := &productEntities.ComponentReportDownload{
UserID: purchaseOrder.UserID, UserID: purchaseOrder.UserID,
ProductID: purchaseOrder.ProductID, ProductID: purchaseOrder.ProductID,
ProductCode: product.Code, ProductCode: product.Code,
ProductName: product.Name, ProductName: product.Name,
OrderID: &purchaseOrder.ID, OrderID: &purchaseOrder.ID,
OrderNumber: &purchaseOrder.OrderNo, OrderNumber: &purchaseOrder.OrderNo,
ExpiresAt: calculateExpiryTime(), // 30天后过期 DownloadPrice: purchaseOrder.Amount, // 设置下载价格（从订单获取）
ExpiresAt: calculateExpiryTime(), // 30天后过期
} }
// 保存下载记录 // 保存下载记录

4
internal/domains/product/entities/component_report_download.go
View File

@@ -4,6 +4,7 @@ import (
"time" "time"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/shopspring/decimal"
"gorm.io/gorm" "gorm.io/gorm"
) )
@@ -22,6 +23,9 @@ type ComponentReportDownload struct {
SubProductIDs string `gorm:"type:text" comment:"子产品ID列表（JSON数组，组合包使用）"` SubProductIDs string `gorm:"type:text" comment:"子产品ID列表（JSON数组，组合包使用）"`
SubProductCodes string `gorm:"type:text" comment:"子产品编号列表（JSON数组）"` SubProductCodes string `gorm:"type:text" comment:"子产品编号列表（JSON数组）"`
// 价格相关字段
DownloadPrice decimal.Decimal `gorm:"type:decimal(10,2);not null" comment:"实际支付价格"`
// 下载相关信息 // 下载相关信息
FilePath *string `gorm:"type:varchar(500)" comment:"生成的ZIP文件路径（用于二次下载）"` FilePath *string `gorm:"type:varchar(500)" comment:"生成的ZIP文件路径（用于二次下载）"`
FileHash *string `gorm:"type:varchar(64)" comment:"文件哈希值（用于缓存验证）"` FileHash *string `gorm:"type:varchar(64)" comment:"文件哈希值（用于缓存验证）"`

35
internal/shared/component_report/handler.go
View File

@@ -987,8 +987,9 @@ func (h *ComponentReportHandler) CreatePaymentOrder(c *gin.Context) {
SubProductIDs: string(subProductIDsJSON), SubProductIDs: string(subProductIDsJSON),
SubProductCodes: string(subProductCodesJSON), SubProductCodes: string(subProductCodesJSON),
// 关联购买订单ID // 关联购买订单ID
OrderID: &createdPurchaseOrder.ID, OrderID: &createdPurchaseOrder.ID,
OrderNumber: &outTradeNo, OrderNumber: &outTradeNo,
DownloadPrice: finalPrice, // 设置下载价格
} }
// 记录创建前的详细信息用于调试 // 记录创建前的详细信息用于调试
@@ -1384,13 +1385,14 @@ func (h *ComponentReportHandler) createDownloadRecordIfEligible(ctx context.Cont
// 3. 创建下载记录 // 3. 创建下载记录
download := &entities.ComponentReportDownload{ download := &entities.ComponentReportDownload{
UserID: userID, UserID: userID,
ProductID: productID, ProductID: productID,
ProductCode: product.Code, ProductCode: product.Code,
ProductName: product.Name, ProductName: product.Name,
OrderID: &validOrder.ID, // 添加OrderID字段 OrderID: &validOrder.ID, // 添加OrderID字段
OrderNumber: &validOrder.OrderNo, // 使用OrderNumber字段 OrderNumber: &validOrder.OrderNo, // 使用OrderNumber字段
ExpiresAt: calculateExpiryTime(), // 从创建日起30天 DownloadPrice: validOrder.Amount, // 设置下载价格（从订单获取）
ExpiresAt: calculateExpiryTime(), // 从创建日起30天
} }
// 4. 如果是组合包，获取子产品信息 // 4. 如果是组合包，获取子产品信息
@@ -1562,13 +1564,14 @@ func (h *ComponentReportHandler) createDownloadRecordForPaidOrder(ctx context.Co
// 创建下载记录 // 创建下载记录
download := &entities.ComponentReportDownload{ download := &entities.ComponentReportDownload{
UserID: order.UserID, UserID: order.UserID,
ProductID: order.ProductID, ProductID: order.ProductID,
ProductCode: order.ProductCode, ProductCode: order.ProductCode,
ProductName: order.ProductName, ProductName: order.ProductName,
OrderID: &order.ID, OrderID: &order.ID,
OrderNumber: &order.OrderNo, OrderNumber: &order.OrderNo,
ExpiresAt: calculateExpiryTime(), DownloadPrice: order.Amount, // 设置下载价格（从订单获取）
ExpiresAt: calculateExpiryTime(),
} }
// 如果是组合包，获取子产品信息 // 如果是组合包，获取子产品信息