Commit cf74870e by xiaoer.li@freemud.com

Merge remote-tracking branch 'remotes/origin/feature/2.0-换购券' into qa

parents 7526ae16 f3032761
...@@ -182,12 +182,12 @@ public class ItemServiceImpl implements ItemService { ...@@ -182,12 +182,12 @@ public class ItemServiceImpl implements ItemService {
} }
}); });
} }
if (CollectionUtils.isNotEmpty(skuIds)) { if (CollectionUtils.isEmpty(skuIds)) {
return resultMap; return resultMap;
} }
// 通过skuid查询spuid // 通过skuid查询spuid
GetSpuIdsBySkuIdsDto bySkuIdsDto = new GetSpuIdsBySkuIdsDto(); GetSpuIdsBySkuIdsDto bySkuIdsDto = new GetSpuIdsBySkuIdsDto();
bySkuIdsDto.setProductIds(pids); bySkuIdsDto.setProductIds(skuIds);
bySkuIdsDto.setPartnerId(partnerId); bySkuIdsDto.setPartnerId(partnerId);
ProductListDto productListDto = storeItemClient.getSpuIdsBySkuIds(bySkuIdsDto); ProductListDto productListDto = storeItemClient.getSpuIdsBySkuIds(bySkuIdsDto);
if (ResponseCodeConstant.RESPONSE_SUCCESS.equals(productListDto.getErrcode()) if (ResponseCodeConstant.RESPONSE_SUCCESS.equals(productListDto.getErrcode())
...@@ -201,7 +201,7 @@ public class ItemServiceImpl implements ItemService { ...@@ -201,7 +201,7 @@ public class ItemServiceImpl implements ItemService {
String picture = CollectionUtils.isNotEmpty(product.getProductPictureList()) String picture = CollectionUtils.isNotEmpty(product.getProductPictureList())
? product.getProductPictureList().get(0).getUrl() : product.getPicture(); ? product.getProductPictureList().get(0).getUrl() : product.getPicture();
getProductsVo.setSpuPicture(picture); getProductsVo.setSpuPicture(picture);
getProductsVo.setStatus(product.getStatus()); //getProductsVo.setStatus(product.getStatus());
resultMap.put(skuProductBean.getSkuId(), getProductsVo); resultMap.put(skuProductBean.getSkuId(), getProductsVo);
} }
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment