yoho-search / yoho-search-consumer · Commits

Go to a project

Authored by wangnan
Commit 551e927fbd31616137453093ea41afc81bea3714 2 parents a19a8540 87a88e59

Merge branch 'zf_dependency_opt' into test_newcore

Inline Side-by-side
Showing 1 changed file with 17 additions and 1 deletions
@@ -210,6 +210,9 @@ public class ProductPoolLogicService { @@ -210,6 +210,9 @@ public class ProductPoolLogicService {
210 Double d2 = Double.valueOf(str2); 210 Double d2 = Double.valueOf(str2);
211 BigDecimal b = BigDecimal.valueOf(d2); 211 BigDecimal b = BigDecimal.valueOf(d2);
212 productPoolBO.setPromotionDiscount(b); 212 productPoolBO.setPromotionDiscount(b);
  213 + }else{
  214 + productPoolBO.setPromotionDiscountInt(null);
  215 + productPoolBO.setPromotionDiscount(null);
213 } 216 }
214 } catch (Exception e) { 217 } catch (Exception e) {
215 logger.warn("[class=ProductPoolBuildServiceImpl][fun=getProductPools],product_price exception,[id：{}],[error:{}]", product.getId(), e.getMessage()); 218 logger.warn("[class=ProductPoolBuildServiceImpl][fun=getProductPools],product_price exception,[id：{}],[error:{}]", product.getId(), e.getMessage());
@@ -228,7 +231,7 @@ public class ProductPoolLogicService { @@ -228,7 +231,7 @@ public class ProductPoolLogicService {
228 if (sn != null) { 231 if (sn != null) {
229 productPoolBO.setSalesNum(sn.getSalesNum()); 232 productPoolBO.setSalesNum(sn.getSalesNum());
230 } else { 233 } else {
231 - logger.warn("[class=ProductPoolBuildServiceImpl][fun=getProductPools],product_15day_salesnum_skn is null,[skn：{}]", product.getErpProductId()); 234 + //logger.warn("[class=ProductPoolBuildServiceImpl][fun=getProductPools],product_15day_salesnum_skn is null,[skn：{}]", product.getErpProductId());
232 } 235 }
233 236
234 //来自ProductSizes 237 //来自ProductSizes
@@ -237,10 +240,23 @@ public class ProductPoolLogicService { @@ -237,10 +240,23 @@ public class ProductPoolLogicService {
237 productPoolBO.setSizeIds(pss.getSizeIds()); 240 productPoolBO.setSizeIds(pss.getSizeIds());
238 productPoolBO.setStorageNum(pss.getStorageNum()); 241 productPoolBO.setStorageNum(pss.getStorageNum());
239 } else { 242 } else {
  243 + productPoolBO.setSizeIds(null);
  244 + productPoolBO.setStorageNum(null);
240 logger.warn("[class=ProductPoolBuildServiceImpl][fun=getProductPools],ProductSizes is null,[id：{}]", product.getId()); 245 logger.warn("[class=ProductPoolBuildServiceImpl][fun=getProductPools],ProductSizes is null,[id：{}]", product.getId());
241 } 246 }
242 247
243 } else { 248 } else {
  249 + productPoolBO.setProductSkn(null);
  250 + productPoolBO.setProductId(null);
  251 + productPoolBO.setSales(null);
  252 + productPoolBO.setBrandId(null);
  253 + productPoolBO.setStatus(null);
  254 + productPoolBO.setAttribute(null);
  255 + productPoolBO.setSmallSortId(null);
  256 + productPoolBO.setMiddleSortId(null);
  257 + productPoolBO.setMaxSortId(null);
  258 + productPoolBO.setAgeLevel(null);
  259 + productPoolBO.setGender(null);
244 logger.warn("[class=ProductPoolBuildServiceImpl][fun=getProductPools],product is null,[skn：{}]", productPoolDetail.getProductSkn()); 260 logger.warn("[class=ProductPoolBuildServiceImpl][fun=getProductPools],product is null,[skn：{}]", productPoolDetail.getProductSkn());
245 } 261 }
246 //拼装完毕，塞入productPool对象 262 //拼装完毕，塞入productPool对象