后台面板上线

app/main/api/internal/logic/admin_order/admingetorderdetaillogic.go

@@ -45,6 +45,17 @@ func (l *AdminGetOrderDetailLogic) AdminGetOrderDetail(req *types.AdminGetOrderD
 		isPromotion = 1
 	}
 
+	// 获取查询状态
+	var queryState string
+	builder := l.svcCtx.QueryModel.SelectBuilder().Where("order_id = ?", order.Id).Columns("query_state")
+	queries, err := l.svcCtx.QueryModel.FindAll(l.ctx, builder, "")
+	if err != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "AdminGetOrderDetail, 查询查询状态失败 err: %v", err)
+	}
+	if len(queries) > 0 {
+		queryState = queries[0].QueryState
+	}
+
 	// 构建响应
 	resp = &types.AdminGetOrderDetailResp{
 		Id:              order.Id,
@@ -58,6 +69,7 @@ func (l *AdminGetOrderDetailLogic) AdminGetOrderDetail(req *types.AdminGetOrderD
 		CreateTime:      order.CreateTime.Format("2006-01-02 15:04:05"),
 		UpdateTime:      order.UpdateTime.Format("2006-01-02 15:04:05"),
 		IsPromotion:     isPromotion,
+		QueryState:      queryState,
 	}
 
 	// 处理可选字段

app/main/api/internal/logic/admin_order/admingetorderlistlogic.go

@@ -9,6 +9,7 @@ import (
 	"tyc-server/app/main/model"
 	"tyc-server/common/xerr"
 
+	"github.com/Masterminds/squirrel"
 	"github.com/pkg/errors"
 	"github.com/zeromicro/go-zero/core/logx"
 	"github.com/zeromicro/go-zero/core/mr"
@@ -97,22 +98,49 @@ func (l *AdminGetOrderListLogic) AdminGetOrderList(req *types.AdminGetOrderListR
 		return nil, err
 	}
 
-	// 并发获取产品信息
+	// 并发获取产品信息和查询状态
 	productMap := make(map[int64]string)
+	queryStateMap := make(map[int64]string)
 	var mu sync.Mutex
+
+	// 批量获取查询状态
+	if len(orders) > 0 {
+		orderIds := make([]int64, 0, len(orders))
+		for _, order := range orders {
+			orderIds = append(orderIds, order.Id)
+		}
+		builder := l.svcCtx.QueryModel.SelectBuilder().
+			Where(squirrel.Eq{"order_id": orderIds}).
+			Columns("order_id", "query_state")
+		queries, err := l.svcCtx.QueryModel.FindAll(l.ctx, builder, "")
+		if err != nil && !errors.Is(err, model.ErrNotFound) {
+			return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "AdminGetOrderList, 批量查询查询状态失败 err: %v", err)
+		}
+		for _, query := range queries {
+			queryStateMap[query.OrderId] = query.QueryState
+		}
+	}
+
+	// 并发获取产品信息
 	err = mr.MapReduceVoid(func(source chan<- interface{}) {
 		for _, order := range orders {
-			source <- order.ProductId
+			source <- order
 		}
 	}, func(item interface{}, writer mr.Writer[struct{}], cancel func(error)) {
-		productId := item.(int64)
-		product, err := l.svcCtx.ProductModel.FindOne(l.ctx, productId)
-		if err != nil {
+		order := item.(*model.Order)
+
+		// 获取产品信息
+		product, err := l.svcCtx.ProductModel.FindOne(l.ctx, order.ProductId)
+		if err != nil && !errors.Is(err, model.ErrNotFound) {
 			cancel(errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "AdminGetOrderList, 查询产品信息失败 err: %v", err))
 			return
 		}
 		mu.Lock()
-		productMap[product.Id] = product.ProductName
+		if product != nil {
+			productMap[product.Id] = product.ProductName
+		} else {
+			productMap[order.ProductId] = "" // 产品不存在时设置为空字符串
+		}
 		mu.Unlock()
 		writer.Write(struct{}{})
 	}, func(pipe <-chan struct{}, cancel func(error)) {
@@ -140,6 +168,7 @@ func (l *AdminGetOrderListLogic) AdminGetOrderList(req *types.AdminGetOrderListR
 			Amount:          order.Amount,
 			Status:          order.Status,
 			CreateTime:      order.CreateTime.Format("2006-01-02 15:04:05"),
+			QueryState:      queryStateMap[order.Id],
 		}
 		if order.PayTime.Valid {
 			item.PayTime = order.PayTime.Time.Format("2006-01-02 15:04:05")