Authored by wangnan

Merge branch 'zf_dependency_opt' into test_newcore

... ... @@ -210,6 +210,9 @@ public class ProductPoolLogicService {
Double d2 = Double.valueOf(str2);
BigDecimal b = BigDecimal.valueOf(d2);
productPoolBO.setPromotionDiscount(b);
}else{
productPoolBO.setPromotionDiscountInt(null);
productPoolBO.setPromotionDiscount(null);
}
} catch (Exception e) {
logger.warn("[class=ProductPoolBuildServiceImpl][fun=getProductPools],product_price exception,[id:{}],[error:{}]", product.getId(), e.getMessage());
... ... @@ -228,7 +231,7 @@ public class ProductPoolLogicService {
if (sn != null) {
productPoolBO.setSalesNum(sn.getSalesNum());
} else {
logger.warn("[class=ProductPoolBuildServiceImpl][fun=getProductPools],product_15day_salesnum_skn is null,[skn:{}]", product.getErpProductId());
//logger.warn("[class=ProductPoolBuildServiceImpl][fun=getProductPools],product_15day_salesnum_skn is null,[skn:{}]", product.getErpProductId());
}
//来自ProductSizes
... ... @@ -237,10 +240,23 @@ public class ProductPoolLogicService {
productPoolBO.setSizeIds(pss.getSizeIds());
productPoolBO.setStorageNum(pss.getStorageNum());
} else {
productPoolBO.setSizeIds(null);
productPoolBO.setStorageNum(null);
logger.warn("[class=ProductPoolBuildServiceImpl][fun=getProductPools],ProductSizes is null,[id:{}]", product.getId());
}
} else {
productPoolBO.setProductSkn(null);
productPoolBO.setProductId(null);
productPoolBO.setSales(null);
productPoolBO.setBrandId(null);
productPoolBO.setStatus(null);
productPoolBO.setAttribute(null);
productPoolBO.setSmallSortId(null);
productPoolBO.setMiddleSortId(null);
productPoolBO.setMaxSortId(null);
productPoolBO.setAgeLevel(null);
productPoolBO.setGender(null);
logger.warn("[class=ProductPoolBuildServiceImpl][fun=getProductPools],product is null,[skn:{}]", productPoolDetail.getProductSkn());
}
//拼装完毕,塞入productPool对象
... ...