Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
杨树贤
/
bom_server
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
d1c06c2d
authored
Jun 16, 2020
by
mushishixian
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fix
parent
20bf6765
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
internal/logic/attr.go
internal/logic/match.go
internal/logic/attr.go
View file @
d1c06c2d
...
...
@@ -93,13 +93,13 @@ func searchAttr(attrOrigin, brandName, encap string, search *es.MultiSearchServi
if
strings
.
Contains
(
brandName
,
" "
)
{
//有空格隔开只取第一个
brandName
=
strings
.
Split
(
brandName
,
" "
)[
0
]
//转成全大写,因为ES存的是大写
brandName
=
strings
.
ToUpper
(
brandName
)
//去除特殊符号和中文等等
r1
,
_
:=
regexp
.
Compile
(
`/[^A-Za-z0-9]+/`
)
brandName
=
r1
.
ReplaceAllString
(
brandName
,
""
)
query
.
Should
(
es
.
NewTermQuery
(
"brand_name"
,
brandName
))
}
//转成全大写,因为ES存的是大写
brandName
=
strings
.
ToUpper
(
brandName
)
//去除特殊符号和中文等等
r1
,
_
:=
regexp
.
Compile
(
`/[^A-Za-z0-9]+/`
)
brandName
=
r1
.
ReplaceAllString
(
brandName
,
""
)
query
.
Should
(
es
.
NewTermQuery
(
"brand_name"
,
brandName
))
}
source
:=
es
.
NewSearchSource
()
.
Query
(
query
)
source
.
Sort
(
"brand_sort"
,
true
)
...
...
internal/logic/match.go
View file @
d1c06c2d
...
...
@@ -33,7 +33,7 @@ func MatchGoods(message model.BomMessage) (err error) {
bomItems
:=
bom
.
BomItems
var
perGoDealNumber
int
if
configs
.
ApiSetting
.
Mode
==
"debug"
{
perGoDealNumber
=
20
0
perGoDealNumber
=
4
0
}
else
{
perGoDealNumber
=
40
}
...
...
@@ -298,7 +298,7 @@ func getSearchParams(index, goodsName, brandName string, sort, number int, flag
//if index != "liexin_ziying" {
// source.Sort("single_price_sort", false)
//}
source
.
Sort
(
"single_price_sort"
,
false
)
//
source.Sort("single_price_sort", false)
source
.
Sort
(
"single_price"
,
true
)
//sort=3是按照库存排序
}
else
if
sort
==
3
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment