v1.1

app/main/api/internal/logic/query/querydetailbyordernologic.go

@@ -2,14 +2,9 @@ package query
 
 import (
 	"context"
-	"encoding/hex"
-	"encoding/json"
-	"fmt"
 	"ycc-server/common/ctxdata"
 	"ycc-server/common/xerr"
-	"ycc-server/pkg/lzkit/crypto"
 
-	"github.com/jinzhu/copier"
 	"github.com/pkg/errors"
 
 	"ycc-server/app/main/api/internal/svc"
@@ -49,9 +44,15 @@ func (l *QueryDetailByOrderNoLogic) QueryDetailByOrderNo(req *types.QueryDetailB
 		return "", errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "报告查询, 查找报告错误: %v", err)
 	}
 
-	// 安全验证：确保订单属于当前用户
+	// 安全验证：确保订单属于当前用户，或为该订单的代理
 	if order.UserId != userId {
-		return "", errors.Wrapf(xerr.NewErrCode(xerr.LOGIC_QUERY_NOT_FOUND), "无权查看此订单报告")
+		isAgent, aerr := IsOrderAgent(l.ctx, l.svcCtx, userId, order.Id)
+		if aerr != nil {
+			return "", aerr
+		}
+		if !isAgent {
+			return "", errors.Wrapf(xerr.NewErrCode(xerr.LOGIC_QUERY_NOT_FOUND), "无权查看此订单报告")
+		}
 	}
 
 	// 检查订单状态
@@ -59,108 +60,13 @@ func (l *QueryDetailByOrderNoLogic) QueryDetailByOrderNo(req *types.QueryDetailB
 		return "", errors.Wrapf(xerr.NewErrMsg("订单未支付，无法查看报告"), "")
 	}
 
-	// 获取报告信息
 	queryModel, err := l.svcCtx.QueryModel.FindOneByOrderId(l.ctx, order.Id)
 	if err != nil {
 		return "", errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "报告查询, 查找报告错误: %v", err)
 	}
-
-	var query types.Query
-	query.CreateTime = queryModel.CreateTime.Format("2006-01-02 15:04:05")
-	query.UpdateTime = queryModel.UpdateTime.Format("2006-01-02 15:04:05")
-
-	// 解密查询数据
-	secretKey := l.svcCtx.Config.Encrypt.SecretKey
-	key, decodeErr := hex.DecodeString(secretKey)
-	if decodeErr != nil {
-		return "", errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "报告查询, 获取AES解密解药失败, %v", decodeErr)
+	respStr, buildErr := BuildEncryptedQuery(l.ctx, l.svcCtx, queryModel)
+	if buildErr != nil {
+		return "", buildErr
 	}
-	processParamsErr := ProcessQueryParams(queryModel.QueryParams, &query.QueryParams, key)
-	if processParamsErr != nil {
-		return "", errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "报告查询, 报告参数处理失败: %v", processParamsErr)
-	}
-	processErr := ProcessQueryData(queryModel.QueryData, &query.QueryData, key)
-	if processErr != nil {
-		return "", errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "报告查询, 报告结果处理失败: %v", processErr)
-	}
-	updateFeatureAndProductFeatureErr := l.UpdateFeatureAndProductFeature(queryModel.ProductId, &query.QueryData)
-	if updateFeatureAndProductFeatureErr != nil {
-		return "", errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "报告查询, 报告结果处理失败: %v", updateFeatureAndProductFeatureErr)
-	}
-	// 复制报告数据
-	err = copier.Copy(&query, queryModel)
-	if err != nil {
-		return "", errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "报告查询, 报告结构体复制失败, %v", err)
-	}
-	product, err := l.svcCtx.ProductModel.FindOne(l.ctx, queryModel.ProductId)
-	if err != nil {
-		return "", errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "报告查询, 获取商品信息失败, %v", err)
-	}
-	query.Product = product.ProductEn
-	query.ProductName = product.ProductName
-	queryBytes, marshalErr := json.Marshal(query)
-	if marshalErr != nil {
-		return "", errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "报告查询, 序列化查询结果失败: %v", marshalErr)
-	}
-
-	encryptedQuery, encryptErr := crypto.AesEncrypt(queryBytes, key)
-	if encryptErr != nil {
-		return "", errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "报告查询, 加密查询结果失败: %v", encryptErr)
-	}
-
-	return encryptedQuery, nil
-}
-
-func (l *QueryDetailByOrderNoLogic) UpdateFeatureAndProductFeature(productID int64, target *[]types.QueryItem) error {
-	// 遍历 target 数组，使用倒序遍历，以便删除元素时不影响索引
-	for i := len(*target) - 1; i >= 0; i-- {
-		queryItem := &(*target)[i]
-
-		// 确保 Data 为 map 类型
-		data, ok := queryItem.Data.(map[string]interface{})
-		if !ok {
-			return fmt.Errorf("queryItem.Data 必须是 map[string]interface{} 类型")
-		}
-
-		// 从 Data 中获取 apiID
-		apiID, ok := data["apiID"].(string)
-		if !ok {
-			return fmt.Errorf("queryItem.Data 中的 apiID 必须是字符串类型")
-		}
-
-		// 查询 Feature
-		feature, err := l.svcCtx.FeatureModel.FindOneByApiId(l.ctx, apiID)
-		if err != nil {
-			// 如果 Feature 查不到，也要删除当前 QueryItem
-			*target = append((*target)[:i], (*target)[i+1:]...)
-			continue
-		}
-
-		// 查询 ProductFeatureModel
-		builder := l.svcCtx.ProductFeatureModel.SelectBuilder().Where("product_id = ?", productID)
-		productFeatures, err := l.svcCtx.ProductFeatureModel.FindAll(l.ctx, builder, "")
-		if err != nil {
-			return fmt.Errorf("查询 ProductFeatureModel 错误: %v", err)
-		}
-
-		// 遍历 productFeatures，找到与 feature.ID 关联且 enable == 1 的项
-		var featureData map[string]interface{}
-		// foundFeature := false
-		sort := 0
-		for _, pf := range productFeatures {
-			if pf.FeatureId == feature.Id { // 确保和 Feature 关联
-				sort = int(pf.Sort)
-				break // 找到第一个符合条件的就退出循环
-			}
-		}
-		featureData = map[string]interface{}{
-			"featureName": feature.Name,
-			"sort":        sort,
-		}
-
-		// 更新 queryItem 的 Feature 字段（不是数组）
-		queryItem.Feature = featureData
-	}
-
-	return nil
+	return respStr, nil
 }