team/qnc-server-tob
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix querylist

Browse Source
This commit is contained in:
liangzai 2025-06-09 13:56:39 +08:00
parent 6ba7c3fc72
commit a8a1c79094
1 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
app/main/api/internal/logic/query/querylistlogic.go
View File

@ -91,26 +91,10 @@ func (l *QueryListLogic) QueryList(req *types.QueryListReq) (resp *types.QueryLi
// 查询查询状态 // 查询查询状态
queryInfo, findQueryErr := l.svcCtx.QueryModel.FindOneByOrderId(l.ctx, orderModel.Id) queryInfo, findQueryErr := l.svcCtx.QueryModel.FindOneByOrderId(l.ctx, orderModel.Id)
if findQueryErr == nil { if findQueryErr != nil && !errors.Is(findQueryErr, model.ErrNotFound) {
// 查询存在 return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "订单列表查询, 获取查询信息失败, %+v", findQueryErr)
query.Id = queryInfo.Id }
query.QueryState = queryInfo.QueryState if errors.Is(findQueryErr, model.ErrNotFound) {
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 {
query.QueryState = "未创建" query.QueryState = "未创建"
query.IsQueryCompleted = false 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) { if findAuthErr != nil && !errors.Is(findAuthErr, model.ErrNotFound) {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "订单列表查询, 获取授权信息失败, %+v", findAuthErr) return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "订单列表查询, 获取授权信息失败, %+v", findAuthErr)
} }
if errors.Is(findAuthErr, model.ErrNotFound) { if errors.Is(findAuthErr, model.ErrNotFound) {
query.IsAuthCompleted = false query.IsAuthCompleted = true
} else if authInfo != nil { } else {
// 授权存在
query.IsAuthCompleted = authInfo.Status == model.AuthorizationStatusSuccess 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) list = append(list, query)