From 6ba7c3fc72f65519b113ba026764c233ed039aea Mon Sep 17 00:00:00 2001 From: liangzai <2440983361@qq.com> Date: Mon, 9 Jun 2025 13:43:52 +0800 Subject: [PATCH] fix query list --- .../api/internal/logic/query/querylistlogic.go | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/app/main/api/internal/logic/query/querylistlogic.go b/app/main/api/internal/logic/query/querylistlogic.go index 40e2c3c..d96e9ee 100644 --- a/app/main/api/internal/logic/query/querylistlogic.go +++ b/app/main/api/internal/logic/query/querylistlogic.go @@ -102,24 +102,28 @@ 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存在但authorization不存在,说明已经授权完成 query.IsAuthCompleted = true + } else if authInfo != nil { + // 授权存在,根据状态判断 + query.IsAuthCompleted = authInfo.Status == model.AuthorizationStatusSuccess } - // 授权存在 - query.IsAuthCompleted = authInfo.Status == model.AuthorizationStatusSuccess - } else { query.QueryState = "未创建" query.IsQueryCompleted = false // 获取授权状态 authInfo, findAuthErr := l.svcCtx.AuthorizationModel.FindOneByOrderId(l.ctx, orderModel.Id) - if findAuthErr == nil { - // 授权存在 - query.IsAuthCompleted = authInfo.Status == model.AuthorizationStatusSuccess - } else { + 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 = authInfo.Status == model.AuthorizationStatusSuccess } }