Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop

framework/src/main/java/cn/lili/modules/order/cart/render/impl/CheckDataRender.java

@@ -110,7 +110,8 @@ public class CheckDataRender implements CartRenderStep {
             GoodsSku dataSku = goodsSkuService.getGoodsSkuByIdFromCache(cartSkuVO.getGoodsSku().getId());
             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);
                 //设置新商品

framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuFreightRender.java

@@ -116,6 +116,9 @@ public class SkuFreightRender implements CartRenderStep {
                     }
                 }
             }
+        }else{
+            //自提清空不配送商品
+            tradeDTO.setNotSupportFreight(null);
         }
     }
 

framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreDetailServiceImpl.java

@@ -267,7 +267,7 @@ public class StoreDetailServiceImpl extends ServiceImpl<StoreDetailMapper, Store
      * @param storeId 店铺id
      */
     private void removeCache(String storeId) {
-        cache.get(CachePrefix.STORE.getPrefix() + storeId);
+        cache.remove(CachePrefix.STORE.getPrefix() + storeId);
     }
 
 }