Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop
This commit is contained in:
commit
1a0515361e
@ -110,7 +110,8 @@ public class CheckDataRender implements CartRenderStep {
|
|||||||
GoodsSku dataSku = goodsSkuService.getGoodsSkuByIdFromCache(cartSkuVO.getGoodsSku().getId());
|
GoodsSku dataSku = goodsSkuService.getGoodsSkuByIdFromCache(cartSkuVO.getGoodsSku().getId());
|
||||||
Map<String, Object> promotionMap = promotionGoodsService.getCurrentGoodsPromotion(dataSku, tradeDTO.getCartTypeEnum().name());
|
Map<String, Object> promotionMap = promotionGoodsService.getCurrentGoodsPromotion(dataSku, tradeDTO.getCartTypeEnum().name());
|
||||||
//商品有效性判定
|
//商品有效性判定
|
||||||
if (dataSku == null || dataSku.getUpdateTime().after(cartSkuVO.getGoodsSku().getUpdateTime())) {
|
log.info("dataSku: {}, goodsSku: {}", dataSku, cartSkuVO.getGoodsSku());
|
||||||
|
if (dataSku == null || (dataSku.getUpdateTime() != null && dataSku.getUpdateTime().after(cartSkuVO.getGoodsSku().getUpdateTime()))) {
|
||||||
//商品失效,将商品移除并重新填充商品
|
//商品失效,将商品移除并重新填充商品
|
||||||
cartSkuVOS.remove(cartSkuVO);
|
cartSkuVOS.remove(cartSkuVO);
|
||||||
//设置新商品
|
//设置新商品
|
||||||
|
Loading…
x
Reference in New Issue
Block a user