Authored by saihide

delete pools

... ... @@ -97,7 +97,6 @@ public class ProductPoolDetailMqListener extends AbstractMqListener {
indexData.put(ProductIndexEsField.productId, productId);
indexData.put(ProductIndexEsField.poolIds,productPoolDetailSknBO.getPoolIds());
indexData.put(ProductIndexEsField.hrShopIds,productPoolDetailSknBO.getHrShopIds());
indexData.put(ProductIndexEsField.pools, productPoolDetailSknBO.getPools());
this.updateProductIndexWithDataMap(indexData, productId);
}
... ...
... ... @@ -523,20 +523,6 @@
"type": "text",
"analyzer": "comma_spliter"
},
"pools": {
"type": "nested",
"properties": {
"id": {
"type": "integer"
},
"pool_id": {
"type": "integer"
},
"sort": {
"type": "integer"
}
}
},
"goodsList": {
"properties": {
"color_code": {
... ...
... ... @@ -84,9 +84,6 @@ public class ProductIndexBO extends ProductIBO implements Serializable {
private String productFeatureFactor;
private String productFeatureFactorExist;
// from product_pool_detail
private JSONArray pools;
// from `erp_product`.`product_ext`
private String sknDefaultImg;
... ... @@ -465,14 +462,6 @@ public class ProductIndexBO extends ProductIBO implements Serializable {
this.tblCountryName = tblCountryName;
}
public JSONArray getPools() {
return pools;
}
public void setPools(JSONArray pools) {
this.pools = pools;
}
public String getSknDefaultImg() {
return sknDefaultImg;
}
... ...
... ... @@ -9,15 +9,6 @@ public class ProductPoolDetailSknBO {
private Integer productSkn;
private String poolIds;
private String hrShopIds;
private JSONArray pools;
public JSONArray getPools() {
return pools;
}
public void setPools(JSONArray pools) {
this.pools = pools;
}
public Integer getProductSkn() {
return productSkn;
... ...
... ... @@ -158,7 +158,6 @@ public class ProductIndexBOToMapService {
map.put(ProductIndexEsField.tblBrandId, productIndexBO.getTblBrandId());
map.put(ProductIndexEsField.tblCountryId, productIndexBO.getTblCountryId());
map.put(ProductIndexEsField.tblCountryName, productIndexBO.getTblCountryName());
map.put(ProductIndexEsField.pools, productIndexBO.getPools());
map.put(ProductIndexEsField.marketPhrase, productIndexBO.getMarketPhrase());
map.put(ProductIndexEsField.sellType, productIndexBO.getSellType());
map.put(ProductIndexEsField.physicalChannels, productIndexBO.getPhysicalChannels());
... ...
... ... @@ -35,9 +35,6 @@ public class ProductPoolDetailSknBuilder implements IndexFieldBuilder {
if (productPoolDetailSknBO != null) {
productIndexBO.setPoolIds(productPoolDetailSknBO.getPoolIds());
productIndexBO.setHrShopIds(productPoolDetailSknBO.getHrShopIds());
if (productPoolDetailSknBO.getPools() != null) {
productIndexBO.setPools(productPoolDetailSknBO.getPools());
}
}
}
}
... ... @@ -71,23 +68,16 @@ public class ProductPoolDetailSknBuilder implements IndexFieldBuilder {
hrShopIds = productPools.stream().map(ProductPool::getShopId).filter(Objects::nonNull).distinct().map(e -> e.toString()).collect(Collectors.joining(","));
}
StringBuilder poolId = new StringBuilder();
JSONArray pools = new JSONArray();
for (ProductPoolDetail productPoolDetail : productPoolDetailsTemp) {
if (productPoolDetail.getProductType().equals("1")) {
poolId.append(productPoolDetail.getPoolId());
poolId.append(',');
JSONObject pool = new JSONObject();
pool.put("id", productPoolDetail.getId());
pool.put("pool_id", productPoolDetail.getPoolId());
pool.put("sort", productPoolDetail.getSort());
pools.add(pool);
}
}
ProductPoolDetailSknBO productPoolDetailSknBO = new ProductPoolDetailSknBO();
productPoolDetailSknBO.setProductSkn(skn);
productPoolDetailSknBO.setPoolIds(poolId.toString());
productPoolDetailSknBO.setHrShopIds(hrShopIds);
productPoolDetailSknBO.setPools(pools);
productPoolDetailSknBOs.add(productPoolDetailSknBO);
}
return productPoolDetailSknBOs;
... ...