diff --git a/model/gmodel/fs_preprocess_logo_logic.go b/model/gmodel/fs_preprocess_logo_logic.go index aee1dbee..3601c8d8 100644 --- a/model/gmodel/fs_preprocess_logo_logic.go +++ b/model/gmodel/fs_preprocess_logo_logic.go @@ -14,7 +14,7 @@ import ( // TODO: 使用model的属性做你想做的 // 搜索建议 -func (p *FsPreprocessLogoModel) PreLogoSearchSuggestions(ctx context.Context, zipcode string, keywordsStr string, count int) (resp []FsPreprocessLogo, err error) { +func (p *FsPreprocessLogoModel) PreLogoSearch(ctx context.Context, zipcode string, keywordsStr string, count int) (resp []FsPreprocessLogo, err error) { keywords := regexp.MustCompile(`\s+`).Split(keywordsStr, -1) for i, v := range keywords { keywords[i] = "+" + v + "*" diff --git a/server/info/internal/logic/prelogosearchlogic.go b/server/info/internal/logic/prelogosearchlogic.go index 650a1599..36b8f433 100644 --- a/server/info/internal/logic/prelogosearchlogic.go +++ b/server/info/internal/logic/prelogosearchlogic.go @@ -41,7 +41,14 @@ func (l *PreLogoSearchLogic) PreLogoSearch(req *types.PreLogoSearchRequest, user return resp.SetStatus(basic.CodeSearchZipCodeErr) } - return resp.SetStatus(basic.CodeOK) + result, err := l.svcCtx.AllModels.FsPreprocessLogo.PreLogoSearch(l.ctx, req.ZipCode, req.Keywords, 1) + if err != nil { + return resp.SetStatus(basic.CodeApiErr, err) + } + + return resp.SetStatus(basic.CodeOK, map[string]any{ + "result": result, + }) } // 处理逻辑后 w,r 如:重定向, resp 必须重新处理 diff --git a/server/info/internal/logic/prelogosearchsuggestionslogic.go b/server/info/internal/logic/prelogosearchsuggestionslogic.go index 372510fb..5c2586d8 100644 --- a/server/info/internal/logic/prelogosearchsuggestionslogic.go +++ b/server/info/internal/logic/prelogosearchsuggestionslogic.go @@ -41,7 +41,7 @@ func (l *PreLogoSearchSuggestionsLogic) PreLogoSearchSuggestions(req *types.PreL return resp.SetStatus(basic.CodeSearchZipCodeErr) } - result, err := l.svcCtx.AllModels.FsPreprocessLogo.PreLogoSearchSuggestions(l.ctx, req.ZipCode, req.Keywords, 5) + result, err := l.svcCtx.AllModels.FsPreprocessLogo.PreLogoSearch(l.ctx, req.ZipCode, req.Keywords, 5) if err != nil { return resp.SetStatus(basic.CodeApiErr, err) }