f

app/main/api/internal/logic/admin_query/admingetquerydetailbyorderidlogic.go

@@ -72,7 +72,8 @@ func (l *AdminGetQueryDetailByOrderIdLogic) AdminGetQueryDetailByOrderId(req *ty
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "报告查询, 获取商品信息失败, %v", err)
 	}
 	query.ProductName = product.ProductName
-	return &types.AdminGetQueryDetailByOrderIdResp{
+
+	resp = &types.AdminGetQueryDetailByOrderIdResp{
 		Id:          query.Id,
 		OrderId:     query.OrderId,
 		UserId:      query.UserId,
@@ -82,7 +83,23 @@ func (l *AdminGetQueryDetailByOrderIdLogic) AdminGetQueryDetailByOrderId(req *ty
 		CreateTime:  query.CreateTime,
 		UpdateTime:  query.UpdateTime,
 		QueryState:  query.QueryState,
-	}, nil
+	}
+	// 从订单表补充：商户订单号、支付订单号、支付状态、支付时间、退款时间
+	orderModel, orderErr := l.svcCtx.OrderModel.FindOne(l.ctx, req.OrderId)
+	if orderErr == nil && orderModel != nil {
+		resp.OrderNo = orderModel.OrderNo
+		if orderModel.PlatformOrderId.Valid {
+			resp.PlatformOrderId = orderModel.PlatformOrderId.String
+		}
+		resp.PaymentStatus = orderModel.Status
+		if orderModel.PayTime.Valid {
+			resp.PayTime = orderModel.PayTime.Time.Format("2006-01-02 15:04:05")
+		}
+		if orderModel.RefundTime.Valid {
+			resp.RefundTime = orderModel.RefundTime.Time.Format("2006-01-02 15:04:05")
+		}
+	}
+	return resp, nil
 }
 
 // ProcessQueryData 解密和反序列化 QueryData