yoho-search / yoho-search-consumer · Commits

Go to a project

Authored by wangnan
Commit 6ecde7de24929ccafa65d2b94407180aa06de623 2 parents 0b69da47 49b6bb7e

Merge branch 'wn_tbl_country' into 0110 

# Conflicts:
#	index/src/main/resources/esmapping/productindex.json
#	service/src/main/java/com/yoho/search/consumer/service/base/ProductIndexService.java
#	service/src/main/java/com/yoho/search/consumer/service/bo/ProductIndexBO.java
#	service/src/main/java/com/yoho/search/consumer/service/logic/TblLogicService.java
Inline Side-by-side
Showing 4 changed files with 912 additions and 884 deletions
{
"productindex": {
"_all":{
"enabled":false
"productindex": {
"_all":{
"enabled":false
},
"_source":{
"enabled":true
},
"properties": {
"id": {
"type": "long"
},
"productId": {
"type": "long"
},
"shopId": {
"type": "long"
},
"salesNum": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"isSoonSoldOut": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"isSoldOut": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"soldOut": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"storageNum": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"sortWeight": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"brandWeight": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"shopWeight": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"shelveTime": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"shelveDay": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"salesPrice": {
"type": "double",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"promotionDiscount": {
"type": "double",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"promotionDiscountInt": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"specialPrice": {
"type": "double",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"marketPrice": {
"type": "double",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"vipPrice": {
"type": "double",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"vip1Price": {
"type": "double",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"vip2Price": {
"type": "double",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"vip3Price": {
"type": "double",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"studentPrice": {
"type": "double",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"isStudentPrice": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"isstudentrebate": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"isSeckill": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"isInstalment": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"islimited": {
"type": "string",
"index": "not_analyzed",
"fielddata": {
"format": "doc_values"
}
},
"isnew": {
"type": "string",
"index": "not_analyzed",
"fielddata": {
"format": "doc_values"
}
},
"brandId": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"isdown": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"isadvance": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"cnAlphabet": {
"type": "string",
"index": "not_analyzed"
},
"isAuditing": {
"type": "string",
"index": "not_analyzed"
},
"brandAlif": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"productName": {
"fields": {
"productName": {
"type": "string",
"index": "not_analyzed",
"copy_to": ["searchField","searchField_ansj"]
},
"productName_ansj": {
"type": "string",
"store": false,
"analyzer": "ik_complex",
"search_analyzer": "ik_complex"
}
},
"_source":{
"enabled":true
"type": "multi_field"
},
"brandName": {
"type": "string",
"store": false,
"analyzer": "ik_complex",
"search_analyzer": "ik_complex",
"copy_to": ["searchField","searchField_ansj"]
},
"brandName": {
"fields": {
"brandName": {
"type": "string",
"store": false,
"analyzer": "ik_complex",
"search_analyzer": "ik_complex",
"copy_to": ["searchField","searchField_ansj"]
},
"brandName_lowercase": {
"type": "string",
"store": false,
"analyzer": "lowercase_keyword",
"search_analyzer": "ik_complex"
}
},
"properties": {
"id": {
"type": "long"
},
"productId": {
"type": "long"
},
"shopId": {
"type": "long"
},
"salesNum": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"isSoonSoldOut": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"isSoldOut": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"soldOut": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"storageNum": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"sortWeight": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"brandWeight": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"shopWeight": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"shelveTime": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"shelveDay": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"salesPrice": {
"type": "double",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"promotionDiscount": {
"type": "double",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"promotionDiscountInt": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"specialPrice": {
"type": "double",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"marketPrice": {
"type": "double",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"vipPrice": {
"type": "double",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"vip1Price": {
"type": "double",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"vip2Price": {
"type": "double",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"vip3Price": {
"type": "double",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"studentPrice": {
"type": "double",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"isStudentPrice": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"isstudentrebate": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"isSeckill": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"isInstalment": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"islimited": {
"type": "string",
"index": "not_analyzed",
"fielddata": {
"format": "doc_values"
}
},
"isnew": {
"type": "string",
"index": "not_analyzed",
"fielddata": {
"format": "doc_values"
}
},
"brandId": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"isdown": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"isadvance": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"cnAlphabet": {
"type": "string",
"index": "not_analyzed"
},
"isAuditing": {
"type": "string",
"index": "not_analyzed"
},
"brandAlif": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"productName": {
"fields": {
"productName": {
"type": "string",
"index": "not_analyzed",
"copy_to": ["searchField","searchField_ansj"]
},
"productName_ansj": {
"type": "string",
"store": false,
"analyzer": "ik_complex",
"search_analyzer": "ik_complex"
}
},
"type": "multi_field"
},
"brandName": {
"type": "string",
"store": false,
"analyzer": "ik_complex",
"search_analyzer": "ik_complex",
"copy_to": ["searchField","searchField_ansj"]
},
"brandName": {
"fields": {
"brandName": {
"type": "string",
"store": false,
"analyzer": "ik_complex",
"search_analyzer": "ik_complex",
"copy_to": ["searchField","searchField_ansj"]
},
"brandName_lowercase": {
"type": "string",
"store": false,
"analyzer": "lowercase_keyword",
"search_analyzer": "ik_complex"
}
},
"type": "multi_field"
},
"brandNameCn": {
"fields": {
"brandNameCn": {
"type": "string",
"store": false,
"analyzer": "ik_complex",
"search_analyzer": "ik_complex",
"copy_to": ["searchField","searchField_ansj"]
},
"brandNameCn_pinyin": {
"type": "string",
"store": false,
"analyzer": "pinyin_analyzer",
"search_analyzer": "ik_complex"
}
},
"type": "multi_field"
},
"brandNameEn": {
"type": "string",
"store": false,
"analyzer": "ik_complex",
"search_analyzer": "ik_complex",
"copy_to": ["searchField","searchField_ansj"]
},
"brandKeyword": {
"type": "string",
"store": false,
"analyzer": "ik_complex",
"search_analyzer": "ik_complex"
},
"productKeyword": {
"type": "string",
"store": false,
"analyzer": "ik_complex",
"search_analyzer": "ik_complex"
},
"brandDomain": {
"type": "string",
"analyzer": "ik_complex",
"search_analyzer": "ik_complex",
"copy_to": ["searchField","searchField_ansj"]
},
"hotKeyword": {
"type": "string",
"store": false,
"analyzer": "ik_complex",
"search_analyzer": "ik_complex"
},
"salesPhrase": {
"type": "string",
"store": false,
"analyzer": "ik_complex",
"search_analyzer": "ik_complex",
"copy_to": "searchField_ansj"
},
"productSkn": {
"fields": {
"productSkn": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"productSkn_ansj": {
"type": "string",
"store": false,
"analyzer": "keyword",
"search_analyzer": "comma_spliter"
}
},
"type": "multi_field"
},
"maxSortName": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"middleSortName": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"smallSortName": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"maxSort": {
"fields": {
"maxSort": {
"type": "string",
"store": false,
"analyzer": "ik_complex",
"search_analyzer": "ik_complex",
"copy_to": ["searchField","searchField_ansj"]
},
"maxSort_pinyin": {
"type": "string",
"store": false,
"analyzer": "pinyin_analyzer",
"search_analyzer": "ik_complex"
}
},
"type": "multi_field"
},
"middleSort": {
"fields": {
"middleSort": {
"type": "string",
"store": false,
"analyzer": "ik_complex",
"search_analyzer": "ik_complex",
"copy_to": ["searchField","searchField_ansj"]
},
"middleSort_pinyin": {
"type": "string",
"store": false,
"analyzer": "pinyin_analyzer",
"search_analyzer": "ik_complex"
}
},
"type": "multi_field"
},
"smallSort": {
"fields": {
"smallSort": {
"type": "string",
"store": false,
"analyzer": "ik_complex",
"search_analyzer": "ik_complex",
"copy_to": ["searchField","searchField_ansj"]
},
"smallSort_pinyin": {
"type": "string",
"store": false,
"analyzer": "pinyin_analyzer",
"search_analyzer": "ik_complex"
}
},
"type": "multi_field"
},
"maxSortId": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"middleSortId": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"smallSortId": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"gender": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"style": {
"type": "string",
"store": false,
"analyzer": "ik_complex",
"search_analyzer": "ik_complex",
"copy_to": ["searchField","searchField_ansj"]
},
"isSpecial": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"isDiscount": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"specialoffer": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"sellChannels": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"isDown": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"isAdvance": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"isSales": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"isHot": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"status": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"firstShelveTime": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"isDepositAdvance": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"isLimitbuy": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"poolId": {
"type": "string",
"analyzer":"comma_spliter"
},
"isrecommend": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"ispromotion": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"vipDiscountType": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"isspecial": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"folderId": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"isOutlets": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"attribute": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"ishot": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"seasonsS": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
},
"copy_to": ["searchField","searchField_ansj"]
},
"specialSearchField": {
"type": "string",
"store": false,
"analyzer": "ik_complex",
"search_analyzer": "ik_complex"
},
"colorIds": {
"type": "string",
"analyzer":"comma_spliter"
},
"ageLevel": {
"type": "string",
"analyzer":"comma_spliter"
},
"appType": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"countryId": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"seasons": {
"type": "string",
"analyzer":"comma_spliter",
"copy_to": ["searchField","searchField_ansj"]
},
"colorNames": {
"type": "string",
"store": false,
"analyzer": "ik_complex",
"search_analyzer": "ik_complex",
"copy_to": ["searchField","searchField_ansj"]
},
"sizeNames": {
"type": "string",
"store": false,
"analyzer": "ik_complex",
"search_analyzer": "ik_complex",
"copy_to": ["searchField","searchField_ansj"]
},
"sizeIds": {
"type": "string",
"analyzer":"comma_spliter"
},
"promotionIds": {
"type": "string",
"analyzer":"comma_spliter"
},
"standardIds": {
"type": "string",
"analyzer":"comma_spliter"
},
"standardNames": {
"type": "string",
"analyzer":"comma_spliter",
"copy_to": ["searchField","searchField_ansj"]
},
"standardOnlyNames": {
"fields": {
"standardOnlyNames": {
"type": "string",
"index": "not_analyzed",
"copy_to": "searchField_ansj"
},
"standardOnlyNames_ansj": {
"type": "string",
"store": false,
"analyzer": "ik_complex",
"search_analyzer": "ik_complex"
},
"standardOnlyNames_pinyin": {
"type": "string",
"store": false,
"analyzer": "pinyin_analyzer",
"search_analyzer": "ik_complex"
}
},
"type": "multi_field"
},
"styleIds": {
"type": "string",
"analyzer":"comma_spliter"
},
"genderS": {
"type": "string",
"analyzer":"comma_spliter",
"search_analyzer": "ik_complex",
"copy_to": ["searchField","searchField_ansj"]
},
"defaultImages": {
"type": "string"
},
"editTime": {
"type": "integer",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"basePinRatio": {
"type": "double",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"breakingRate": {
"type": "double",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"discountScore": {
"type": "double",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"searchField_ansj": {
"type": "string",
"store": false,
"analyzer": "ik_complex",
"search_analyzer": "ik_complex"
},
"searchField": {
"type": "string",
"analyzer": "lowercase_keyword_ngram",
"search_analyzer": "ik_complex"
},
"isGlobal": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"goodsList": {
"properties": {
"color_code": {
"type": "string",
"index": "not_analyzed"
},
"color_id": {
"type": "string",
"index": "not_analyzed"
},
"color_name": {
"type": "string",
"index": "not_analyzed"
},
"color_value": {
"type": "string",
"index": "not_analyzed"
},
"goods_id": {
"type": "string",
"index": "not_analyzed"
},
"images_url": {
"type": "string",
"index": "not_analyzed"
},
"is_default": {
"type": "string",
"index": "not_analyzed"
},
"product_skc": {
"type": "string",
"index": "not_analyzed"
},
"status": {
"type": "string",
"index": "not_analyzed"
}
}
},
"activities": {
"type" : "nested",
"properties": {
"activity_id": {
"type": "integer"
},
"template_id": {
"type": "integer"
},
"order_by": {
"type": "integer"
},
"is_recommend": {
"type": "integer"
},
"status": {
"type": "integer"
}
}
},
"isForbiddenSortBrand": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"newPageProdBoost": {
"type": "double",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"brandPageProdBoost": {
"type": "double",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"sortPageProdBoost": {
"type": "double",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"searchPageProdBoost": {
"type": "double",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"storageUpdateTime": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
"type": "multi_field"
},
"brandNameCn": {
"fields": {
"brandNameCn": {
"type": "string",
"store": false,
"analyzer": "ik_complex",
"search_analyzer": "ik_complex",
"copy_to": ["searchField","searchField_ansj"]
},
"brandNameCn_pinyin": {
"type": "string",
"store": false,
"analyzer": "pinyin_analyzer",
"search_analyzer": "ik_complex"
}
},
"type": "multi_field"
},
"brandNameEn": {
"type": "string",
"store": false,
"analyzer": "ik_complex",
"search_analyzer": "ik_complex",
"copy_to": ["searchField","searchField_ansj"]
},
"brandKeyword": {
"type": "string",
"store": false,
"analyzer": "ik_complex",
"search_analyzer": "ik_complex"
},
"productKeyword": {
"type": "string",
"store": false,
"analyzer": "ik_complex",
"search_analyzer": "ik_complex"
},
"brandDomain": {
"type": "string",
"analyzer": "ik_complex",
"search_analyzer": "ik_complex",
"copy_to": ["searchField","searchField_ansj"]
},
"hotKeyword": {
"type": "string",
"store": false,
"analyzer": "ik_complex",
"search_analyzer": "ik_complex"
},
"salesPhrase": {
"type": "string",
"store": false,
"analyzer": "ik_complex",
"search_analyzer": "ik_complex",
"copy_to": "searchField_ansj"
},
"productSkn": {
"fields": {
"productSkn": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"productSkn_ansj": {
"type": "string",
"store": false,
"analyzer": "keyword",
"search_analyzer": "comma_spliter"
}
},
"type": "multi_field"
},
"maxSortName": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"middleSortName": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"smallSortName": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"maxSort": {
"fields": {
"maxSort": {
"type": "string",
"store": false,
"analyzer": "ik_complex",
"search_analyzer": "ik_complex",
"copy_to": ["searchField","searchField_ansj"]
},
"maxSort_pinyin": {
"type": "string",
"store": false,
"analyzer": "pinyin_analyzer",
"search_analyzer": "ik_complex"
}
},
"type": "multi_field"
},
"middleSort": {
"fields": {
"middleSort": {
"type": "string",
"store": false,
"analyzer": "ik_complex",
"search_analyzer": "ik_complex",
"copy_to": ["searchField","searchField_ansj"]
},
"middleSort_pinyin": {
"type": "string",
"store": false,
"analyzer": "pinyin_analyzer",
"search_analyzer": "ik_complex"
}
},
"type": "multi_field"
},
"smallSort": {
"fields": {
"smallSort": {
"type": "string",
"store": false,
"analyzer": "ik_complex",
"search_analyzer": "ik_complex",
"copy_to": ["searchField","searchField_ansj"]
},
"smallSort_pinyin": {
"type": "string",
"store": false,
"analyzer": "pinyin_analyzer",
"search_analyzer": "ik_complex"
}
},
"type": "multi_field"
},
"maxSortId": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"middleSortId": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"smallSortId": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"gender": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"style": {
"type": "string",
"store": false,
"analyzer": "ik_complex",
"search_analyzer": "ik_complex",
"copy_to": ["searchField","searchField_ansj"]
},
"isSpecial": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"isDiscount": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"specialoffer": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"sellChannels": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"isDown": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"isAdvance": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"isSales": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"isHot": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"status": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"firstShelveTime": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"isDepositAdvance": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"isLimitbuy": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"poolId": {
"type": "string",
"analyzer":"comma_spliter"
},
"isrecommend": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"ispromotion": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"vipDiscountType": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"isspecial": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"folderId": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"isOutlets": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"attribute": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"ishot": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"seasonsS": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
},
"copy_to": ["searchField","searchField_ansj"]
},
"specialSearchField": {
"type": "string",
"store": false,
"analyzer": "ik_complex",
"search_analyzer": "ik_complex"
},
"colorIds": {
"type": "string",
"analyzer":"comma_spliter"
},
"ageLevel": {
"type": "string",
"analyzer":"comma_spliter"
},
"appType": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"countryId": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"seasons": {
"type": "string",
"analyzer":"comma_spliter",
"copy_to": ["searchField","searchField_ansj"]
},
"colorNames": {
"type": "string",
"store": false,
"analyzer": "ik_complex",
"search_analyzer": "ik_complex",
"copy_to": ["searchField","searchField_ansj"]
},
"sizeNames": {
"type": "string",
"store": false,
"analyzer": "ik_complex",
"search_analyzer": "ik_complex",
"copy_to": ["searchField","searchField_ansj"]
},
"sizeIds": {
"type": "string",
"analyzer":"comma_spliter"
},
"promotionIds": {
"type": "string",
"analyzer":"comma_spliter"
},
"standardIds": {
"type": "string",
"analyzer":"comma_spliter"
},
"standardNames": {
"type": "string",
"analyzer":"comma_spliter",
"copy_to": ["searchField","searchField_ansj"]
},
"standardOnlyNames": {
"fields": {
"standardOnlyNames": {
"type": "string",
"index": "not_analyzed",
"copy_to": "searchField_ansj"
},
"standardOnlyNames_ansj": {
"type": "string",
"store": false,
"analyzer": "ik_complex",
"search_analyzer": "ik_complex"
},
"standardOnlyNames_pinyin": {
"type": "string",
"store": false,
"analyzer": "pinyin_analyzer",
"search_analyzer": "ik_complex"
}
},
"type": "multi_field"
},
"styleIds": {
"type": "string",
"analyzer":"comma_spliter"
},
"genderS": {
"type": "string",
"analyzer":"comma_spliter",
"search_analyzer": "ik_complex",
"copy_to": ["searchField","searchField_ansj"]
},
"defaultImages": {
"type": "string"
},
"editTime": {
"type": "integer",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"basePinRatio": {
"type": "double",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"breakingRate": {
"type": "double",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"discountScore": {
"type": "double",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"searchField_ansj": {
"type": "string",
"store": false,
"analyzer": "ik_complex",
"search_analyzer": "ik_complex"
},
"searchField": {
"type": "string",
"analyzer": "lowercase_keyword_ngram",
"search_analyzer": "ik_complex"
},
"isGlobal": {
"type": "string",
"index": "not_analyzed",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"goodsList": {
"properties": {
"color_code": {
"type": "string",
"index": "not_analyzed"
},
"color_id": {
"type": "string",
"index": "not_analyzed"
},
"color_name": {
"type": "string",
"index": "not_analyzed"
},
"color_value": {
"type": "string",
"index": "not_analyzed"
},
"goods_id": {
"type": "string",
"index": "not_analyzed"
},
"images_url": {
"type": "string",
"index": "not_analyzed"
},
"is_default": {
"type": "string",
"index": "not_analyzed"
},
"product_skc": {
"type": "string",
"index": "not_analyzed"
},
"status": {
"type": "string",
"index": "not_analyzed"
}
}
},
"activities": {
"type" : "nested",
"properties": {
"activity_id": {
"type": "integer"
},
"template_id": {
"type": "integer"
},
"order_by": {
"type": "integer"
},
"is_recommend": {
"type": "integer"
},
"status": {
"type": "integer"
}
}
},
"isForbiddenSortBrand": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"newPageProdBoost": {
"type": "double",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"brandPageProdBoost": {
"type": "double",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"sortPageProdBoost": {
"type": "double",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"searchPageProdBoost": {
"type": "double",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"storageUpdateTime": {
"type": "long",
"doc_values": true,
"fielddata": {
"format": "doc_values"
}
},
"tblCountryId": {
"type": "integer"
},
"tblCountryName": {
"type": "string",
"index": "not_analyzed"
}
}
}
}
\ No newline at end of file
... ...
... ... @@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONException;
import com.yoho.search.consumer.service.bo.ProductIndexBO;
import com.yoho.search.consumer.service.logic.SpecialDealLogicService;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
... ... @@ -189,6 +188,8 @@ public class ProductIndexService {
map.put("specialSearchField", productIndexBO.getSpecialSearchField());
map.put("isForbiddenSortBrand", productIndexBO.getIsForbiddenSortBrand());
map.put("promotionIds", productIndexBO.getPromotionIds());
map.put("tblCountryId", productIndexBO.getTblCountryId());
map.put("tblCountryName", productIndexBO.getTblCountryName());
return map;
}
... ...
... ... @@ -97,7 +97,11 @@ public class ProductIndexBO extends ProductIBO implements Serializable {
//from erp_product.promotion_product
private String promotionIds;
// get
//from tbl_product
private Integer tblCountryId;
private String tblCountryName;
public BigDecimal getSpecialPrice() {
return specialPrice;
}
... ... @@ -466,4 +470,19 @@ public class ProductIndexBO extends ProductIBO implements Serializable {
public void setPromotionIds(String promotionIds) {
this.promotionIds = promotionIds;
}
public Integer getTblCountryId() {
return tblCountryId;
}
public void setTblCountryId(Integer tblCountryId) {
this.tblCountryId = tblCountryId;
}
public String getTblCountryName() {
return tblCountryName;
}
public void setTblCountryName(String tblCountryName) {
this.tblCountryName = tblCountryName;
}
}
\ No newline at end of file
... ...
... ... @@ -238,6 +238,7 @@ public class TblLogicService {
}
return sortMap;
}
/**
* 处理brand
*
... ... @@ -482,8 +483,8 @@ public class TblLogicService {
productIndexBO.setBreakingRate(0d);
productIndexBO.setBasePinRatio(0);
//处理国家id和名称
//productIndexBO.setTblCountryId(tblProduct.getCountryId());
//productIndexBO.setTblCountryName(countryFieldMap.get(tblProduct.getCountryId()));
productIndexBO.setTblCountryId(tblProduct.getCountryId());
productIndexBO.setTblCountryName(countryFieldMap.get(tblProduct.getCountryId()));
return productIndexBO;
}
... ...