From a8a1c790943700a79af86bcc4864f160714c0cec Mon Sep 17 00:00:00 2001
From: liangzai <2440983361@qq.com>
Date: Mon, 9 Jun 2025 13:56:39 +0800
Subject: [PATCH] fix querylist

---
 .../internal/logic/query/querylistlogic.go    | 45 +++++++++----------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/app/main/api/internal/logic/query/querylistlogic.go b/app/main/api/internal/logic/query/querylistlogic.go
index d96e9ee..b091c90 100644
--- a/app/main/api/internal/logic/query/querylistlogic.go
+++ b/app/main/api/internal/logic/query/querylistlogic.go
@@ -91,26 +91,10 @@ func (l *QueryListLogic) QueryList(req *types.QueryListReq) (resp *types.QueryLi
 
 			// 查询查询状态
 			queryInfo, findQueryErr := l.svcCtx.QueryModel.FindOneByOrderId(l.ctx, orderModel.Id)
-			if findQueryErr == nil {
-				// 查询存在
-				query.Id = queryInfo.Id
-				query.QueryState = queryInfo.QueryState
-				query.IsQueryCompleted = queryInfo.QueryState == model.QueryStateSuccess
-
-				// 获取授权状态
-				authInfo, findAuthErr := l.svcCtx.AuthorizationModel.FindOneByOrderId(l.ctx, orderModel.Id)
-				if findAuthErr != nil && !errors.Is(findAuthErr, model.ErrNotFound) {
-					return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "订单列表查询, 获取授权信息失败, %+v", findAuthErr)
-				}
-
-				if errors.Is(findAuthErr, model.ErrNotFound) {
-					// 如果query存在但authorization不存在，说明已经授权完成
-					query.IsAuthCompleted = true
-				} else if authInfo != nil {
-					// 授权存在，根据状态判断
-					query.IsAuthCompleted = authInfo.Status == model.AuthorizationStatusSuccess
-				}
-			} else {
+			if findQueryErr != nil && !errors.Is(findQueryErr, model.ErrNotFound) {
+				return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "订单列表查询, 获取查询信息失败, %+v", findQueryErr)
+			}
+			if errors.Is(findQueryErr, model.ErrNotFound) {
 				query.QueryState = "未创建"
 				query.IsQueryCompleted = false
 
@@ -119,12 +103,27 @@ func (l *QueryListLogic) QueryList(req *types.QueryListReq) (resp *types.QueryLi
 				if findAuthErr != nil && !errors.Is(findAuthErr, model.ErrNotFound) {
 					return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "订单列表查询, 获取授权信息失败, %+v", findAuthErr)
 				}
-
 				if errors.Is(findAuthErr, model.ErrNotFound) {
-					query.IsAuthCompleted = false
-				} else if authInfo != nil {
+					query.IsAuthCompleted = true
+				} else {
+					// 授权存在
 					query.IsAuthCompleted = authInfo.Status == model.AuthorizationStatusSuccess
 				}
+			} else {
+				// 查询存在
+				query.Id = queryInfo.Id
+				query.QueryState = queryInfo.QueryState
+				query.IsQueryCompleted = queryInfo.QueryState == model.QueryStateSuccess
+
+				// 获取授权状态
+				authInfo, findAuthErr := l.svcCtx.AuthorizationModel.FindOneByOrderId(l.ctx, orderModel.Id)
+				if findAuthErr == nil {
+					// 授权存在
+					query.IsAuthCompleted = authInfo.Status == model.AuthorizationStatusSuccess
+				} else {
+					// 查询存在但授权不存在，视为已授权
+					query.IsAuthCompleted = true
+				}
 			}
 
 			list = append(list, query)