fix query list

This commit is contained in:
2025-06-09 13:43:52 +08:00
parent a9e6609953
commit 6ba7c3fc72

View File

@@ -102,24 +102,28 @@ 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存在但authorization不存在说明已经授权完成 // 如果query存在但authorization不存在说明已经授权完成
query.IsAuthCompleted = true query.IsAuthCompleted = true
} else if authInfo != nil {
// 授权存在,根据状态判断
query.IsAuthCompleted = authInfo.Status == model.AuthorizationStatusSuccess
} }
// 授权存在
query.IsAuthCompleted = authInfo.Status == model.AuthorizationStatusSuccess
} else { } else {
query.QueryState = "未创建" query.QueryState = "未创建"
query.IsQueryCompleted = false query.IsQueryCompleted = false
// 获取授权状态 // 获取授权状态
authInfo, findAuthErr := l.svcCtx.AuthorizationModel.FindOneByOrderId(l.ctx, orderModel.Id) authInfo, findAuthErr := l.svcCtx.AuthorizationModel.FindOneByOrderId(l.ctx, orderModel.Id)
if findAuthErr == nil { if findAuthErr != nil && !errors.Is(findAuthErr, model.ErrNotFound) {
// 授权存在 return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "订单列表查询, 获取授权信息失败, %+v", findAuthErr)
query.IsAuthCompleted = authInfo.Status == model.AuthorizationStatusSuccess }
} else {
if errors.Is(findAuthErr, model.ErrNotFound) {
query.IsAuthCompleted = false query.IsAuthCompleted = false
} else if authInfo != nil {
query.IsAuthCompleted = authInfo.Status == model.AuthorizationStatusSuccess
} }
} }