From 5d6b475e09629cf975e8680db1f51d62b04b99eb Mon Sep 17 00:00:00 2001 From: misworga831 Date: Fri, 13 Jan 2023 14:22:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E5=95=86=E5=93=81=E6=97=A5=E5=BF=97?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=8F=AF=E8=83=BD=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E7=9A=84=E8=8E=B7=E5=8F=96=E8=B4=AD=E7=89=A9=E8=BD=A6=E7=A9=BA?= =?UTF-8?q?=E6=8C=87=E9=92=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lili/modules/order/cart/render/impl/CheckDataRender.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CheckDataRender.java b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CheckDataRender.java index e04782a4..c7f1e836 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CheckDataRender.java +++ b/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 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 || cartSkuVO.getGoodsSku() == null || dataSku.getUpdateTime().after(cartSkuVO.getGoodsSku().getUpdateTime())) { //商品失效,将商品移除并重新填充商品 cartSkuVOS.remove(cartSkuVO); //设置新商品 From 96a9a32079fc8dd6cffe20b73e37d322a88bb924 Mon Sep 17 00:00:00 2001 From: misworga831 Date: Fri, 13 Jan 2023 14:37:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E5=95=86=E5=93=81=E6=97=A5=E5=BF=97?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=8F=AF=E8=83=BD=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E7=9A=84=E8=8E=B7=E5=8F=96=E8=B4=AD=E7=89=A9=E8=BD=A6=E7=A9=BA?= =?UTF-8?q?=E6=8C=87=E9=92=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/lili/modules/order/cart/render/impl/CheckDataRender.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CheckDataRender.java b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CheckDataRender.java index c7f1e836..76e39c3e 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CheckDataRender.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CheckDataRender.java @@ -111,7 +111,7 @@ public class CheckDataRender implements CartRenderStep { Map promotionMap = promotionGoodsService.getCurrentGoodsPromotion(dataSku, tradeDTO.getCartTypeEnum().name()); //商品有效性判定 log.info("dataSku: {}, goodsSku: {}", dataSku, cartSkuVO.getGoodsSku()); - if (dataSku == null || cartSkuVO.getGoodsSku() == null || dataSku.getUpdateTime().after(cartSkuVO.getGoodsSku().getUpdateTime())) { + if (dataSku == null || (dataSku.getUpdateTime() != null && dataSku.getUpdateTime().after(cartSkuVO.getGoodsSku().getUpdateTime()))) { //商品失效,将商品移除并重新填充商品 cartSkuVOS.remove(cartSkuVO); //设置新商品