yoho-search / yoho-search-service · Commits

Go to a project

Authored by hugufei
Commit 355aeaf3864691e755cc5e61cbcd4305056700e3 1 parent 20ca225b

已结束的变价计划不返回

Inline Side-by-side
Showing 2 changed files with 47 additions and 15 deletions
package com.yoho.search.service.base.index;
import com.yoho.search.base.utils.ISearchConstants;
import com.yoho.search.core.es.model.SearchParam;
import com.yoho.search.core.es.model.SearchResult;
import com.yoho.search.service.base.SearchCommonService;
import com.yoho.search.service.base.SearchDynamicConfigService;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.commons.collections.MapUtils;
import org.elasticsearch.index.query.BoolQueryBuilder;
... ... @@ -14,10 +14,12 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.yoho.search.base.utils.DateUtil;
import com.yoho.search.base.utils.ISearchConstants;
import com.yoho.search.core.es.model.SearchParam;
import com.yoho.search.core.es.model.SearchResult;
import com.yoho.search.service.base.SearchCommonService;
import com.yoho.search.service.base.SearchDynamicConfigService;
@Service
class ProductPricePlanIndexBaseService {
... ... @@ -42,9 +44,9 @@ class ProductPricePlanIndexBaseService {
productPricePlan.put("create_time", MapUtils.getIntValue(source, "createTime"));
productPricePlan.put("effect_time", MapUtils.getIntValue(source, "effectTime"));
productPricePlan.put("end_time", MapUtils.getIntValue(source, "endTime"));
productPricePlan.put("vip_discount", MapUtils.getDoubleValue(source, "vipDiscount"));
productPricePlan.put("show_status", MapUtils.getIntValue(source, "showStatus"));
productPricePlan.put("show_begin_time", MapUtils.getIntValue(source, "showBeginTime"));
productPricePlan.put("vip_discount", MapUtils.getDoubleValue(source, "vipDiscount"));
productPricePlan.put("show_status", MapUtils.getIntValue(source, "showStatus"));
productPricePlan.put("show_begin_time", MapUtils.getIntValue(source, "showBeginTime"));
return productPricePlan;
}
... ... @@ -55,6 +57,7 @@ class ProductPricePlanIndexBaseService {
BoolQueryBuilder boolFilter = QueryBuilders.boolQuery();
boolFilter.must(QueryBuilders.termsQuery("productSkn", sknStr));
boolFilter.must(QueryBuilders.termQuery("status", 1));
boolFilter.mustNot(QueryBuilders.rangeQuery("endTime").lt(DateUtil.getFirstTimeSecond(new Date())).gt(0));// 已结束的变价计划不返回
searchProductPricePlanParam.setFiter(boolFilter);
return searchProductPricePlanParam;
}
... ... @@ -71,7 +74,7 @@ class ProductPricePlanIndexBaseService {
}
return productPricePlanMap;
}
private Map<String, List<Map<String, Object>>> getProductPricePlanMap(SearchResult searchProductPricePlanResult) {
if (searchProductPricePlanResult == null || searchProductPricePlanResult.getResultList() == null || searchProductPricePlanResult.getResultList().size() == 0) {
return new HashMap<String, List<Map<String, Object>>>();
... ...
... ... @@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yoho.search.base.utils.ProductIndexEsField;
@Service
... ... @@ -98,7 +99,7 @@ public class WebProductIndexBaseService {
productMap.put("gender", MapUtils.getString(map, ProductIndexEsField.gender, ""));
productMap.put("status", MapUtils.getIntValue(map, ProductIndexEsField.status, 0));
productMap.put("goods_list", MapUtils.getObject(map, ProductIndexEsField.goodsList, new JSONArray()));
productMap.put("goods_list", this.getPcGoodsList(map));
productMap.put("is_new", MapUtils.getString(map, ProductIndexEsField.isnew, "N"));
productMap.put("is_advance", MapUtils.getString(map, ProductIndexEsField.isAdvance, "N"));
... ... @@ -106,7 +107,7 @@ public class WebProductIndexBaseService {
productMap.put("is_limited", MapUtils.getString(map, ProductIndexEsField.islimited, "N"));
productMap.put("is_discount", MapUtils.getString(map, ProductIndexEsField.isDiscount, "N"));
productMap.put("is_soon_sold_out", MapUtils.getString(map, ProductIndexEsField.isSoonSoldOut, "N"));
// 套餐
productMap.put("bundle_type", MapUtils.getIntValue(map, ProductIndexEsField.bundleType, 0));
... ... @@ -125,6 +126,34 @@ public class WebProductIndexBaseService {
return productMap;
}
private JSONArray getPcGoodsList(Map<String, Object> productMap) {
Object goodList = productMap.get(ProductIndexEsField.goodsList);
if (goodList == null) {
return new JSONArray();
}
if (!(goodList instanceof List)) {
return new JSONArray();
}
List<?> list = (List<?>) (goodList);
JSONArray jsonArray = new JSONArray();
for (Object object : list) {
if (!(object instanceof Map)) {
continue;
}
Map<?,?> good = (Map<?,?>)object;
JSONObject returnObject = new JSONObject();
returnObject.put("product_skc", MapUtils.getIntValue(good, "product_skc", 0));
returnObject.put("images_url", MapUtils.getString(good, "images_url", ""));
returnObject.put("color_name", MapUtils.getString(good, "color_name", ""));
returnObject.put("cover_1", MapUtils.getString(good, "cover_1", ""));
returnObject.put("cover_2", MapUtils.getString(good, "cover_2", ""));
returnObject.put("is_default", MapUtils.getString(good, "is_default", ""));
returnObject.put("status", MapUtils.getIntValue(good, "status", 0));
jsonArray.add(returnObject);
}
return jsonArray;
}
/**
* 获取商品列表[并返回变价计划]
*
... ...