yoho-search / yoho-search-service · Commits

Go to a project

Authored by hugufei
Commit ee4985d0c35ed8fcce4ceb642425b44ad0702a4b 1 parent 6381fd29

fix

Inline Side-by-side
Showing 4 changed files with 17 additions and 12 deletions
... ... @@ -2,13 +2,13 @@ package com.yoho.search.models;
import java.io.Serializable;
public class VipDiscount implements Serializable {
public class SupplierVipDiscount implements Serializable {
private static final long serialVersionUID = -6115990542999416193L;
private double vip1Discount;
private double vip2Discount;
private double vip3Discount;
public VipDiscount(double vip1Discount, double vip2Discount, double vip3Discount) {
public SupplierVipDiscount(double vip1Discount, double vip2Discount, double vip3Discount) {
this.vip1Discount = vip1Discount;
this.vip2Discount = vip2Discount;
this.vip3Discount = vip3Discount;
... ...
... ... @@ -116,6 +116,7 @@ public class ProductListHelper {
/**
* 从es返回的列表，生成返回列表
* 以下方法的顺序不要乱动。
*/
public List<Map<String, Object>> buildReturnInfoByEsSourceList(List<Map<String, Object>> productEsSourceList) {
List<Map<String, Object>> productReturnInfoList = productIndexBaseService.buildProductReturnInfoList(productEsSourceList);
... ...
... ... @@ -36,7 +36,6 @@ public class CutpriceConfigIndexBaseService {
@Autowired
private SearchCommonService searchCommonService;
private static final String PRODUCTINDEX_FIELD_POOLIDS = "pool_ids";
private final Logger logger = LoggerFactory.getLogger(this.getClass());
private static final String CACHE_KEY = "cutpriceConfigCacheKey";
... ...
... ... @@ -7,7 +7,7 @@ import com.yoho.search.base.utils.ISearchConstants;
import com.yoho.search.common.SearchCommonService;
import com.yoho.search.core.es.model.SearchParam;
import com.yoho.search.core.es.model.SearchResult;
import com.yoho.search.models.VipDiscount;
import com.yoho.search.models.SupplierVipDiscount;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.MapUtils;
import org.elasticsearch.index.query.BoolQueryBuilder;
... ... @@ -36,16 +36,16 @@ public class ShopsBrandsIndexBaseService {
private static final String SHOPS_BRANDS_SUPPLIER_CACHE_KEY = "SHOPS_BRANDS_SUPPLIER";
//vipDisountCache Guava Cache
LoadingCache<String, Map<String, VipDiscount>> vipDisountCache = CacheBuilder.newBuilder()
LoadingCache<String, Map<String, SupplierVipDiscount>> vipDisountCache = CacheBuilder.newBuilder()
.maximumSize(100).expireAfterWrite(1, TimeUnit.MINUTES)
.build(new CacheLoader<String, Map<String, VipDiscount>>() {
.build(new CacheLoader<String, Map<String, SupplierVipDiscount>>() {
@Override
public Map<String, VipDiscount> load(String key) throws Exception {
public Map<String, SupplierVipDiscount> load(String key) throws Exception {
return buildShopBrandSupplierVipDiscountMap();
}
});
private Map<String, VipDiscount> buildShopBrandSupplierVipDiscountMap() {
private Map<String, SupplierVipDiscount> buildShopBrandSupplierVipDiscountMap() {
SearchParam searchParam = new SearchParam();
BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
boolQueryBuilder.must(QueryBuilders.termQuery("status", 1));
... ... @@ -53,7 +53,7 @@ public class ShopsBrandsIndexBaseService {
searchParam.setSortBuilders(Arrays.asList(SortBuilders.fieldSort("id").order(SortOrder.DESC)));
searchParam.setSize(3000);
SearchResult searchResult = searchCommonService.doSearch(ISearchConstants.INDEX_NAME_SHOPSBRANDS, searchParam);
Map<String, VipDiscount> cacheResult = new HashMap<>();
Map<String, SupplierVipDiscount> cacheResult = new HashMap<>();
List<Map<String, Object>> resultList = searchResult.getResultList();
for (Map<String, Object> result : resultList) {
Integer shopId = MapUtils.getInteger(result, "shopsId", 0);
... ... @@ -63,7 +63,7 @@ public class ShopsBrandsIndexBaseService {
double vip1Discount = MapUtils.getDouble(result, "vip1Discount", 0.95);
double vip2Discount = MapUtils.getDouble(result, "vip2Discount", 0.9);
double vip3Discount = MapUtils.getDouble(result, "vip3Discount", 0.88);
cacheResult.put(cacheKey, new VipDiscount(vip1Discount, vip2Discount, vip3Discount));
cacheResult.put(cacheKey, new SupplierVipDiscount(vip1Discount, vip2Discount, vip3Discount));
}
return cacheResult;
}
... ... @@ -76,12 +76,17 @@ public class ShopsBrandsIndexBaseService {
return cacheKey.toString();
}
/**
* 按品牌+供应商的价格填充VIP价格
* @param productReturnInfoList
*/
public void fillVipPrice(List<Map<String, Object>> productReturnInfoList) {
try {
if (CollectionUtils.isEmpty(productReturnInfoList)) {
return;
}
Map<String, VipDiscount> cache = vipDisountCache.get(SHOPS_BRANDS_SUPPLIER_CACHE_KEY);
Map<String, SupplierVipDiscount> cache = vipDisountCache.get(SHOPS_BRANDS_SUPPLIER_CACHE_KEY);
for (Map<String, Object> product : productReturnInfoList) {
try {
//1、判断是否需要计算vip价格
... ... @@ -103,7 +108,7 @@ public class ShopsBrandsIndexBaseService {
Integer brandId = MapUtils.getInteger(product, "brand_id", 0);
Integer supplierId = MapUtils.getInteger(product, "supplier_id", 0);
String cacheKey = this.genCacheCacheKey(shopId, brandId, supplierId);
VipDiscount vipDiscount = cache.get(cacheKey);
SupplierVipDiscount vipDiscount = cache.get(cacheKey);
if (vipDiscount == null || vipDiscount.getVip1Discount() == 0 || vipDiscount.getVip2Discount() == 0 || vipDiscount.getVip3Discount() == 0) {
continue;
}
... ...