From 94c87f56451ce77928b5c0f7744085d476e32b6f Mon Sep 17 00:00:00 2001 From: misworga831 Date: Thu, 24 Aug 2023 14:17:21 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=87=BA=E7=8E=B0=E5=88=86=E7=B1=BBid?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cart/render/impl/CheckDataRender.java | 6 ++++- .../serviceimpl/EsGoodsSearchServiceImpl.java | 24 +++++++++---------- 2 files changed, 17 insertions(+), 13 deletions(-) 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 e5cd8981..2333149b 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 @@ -116,7 +116,11 @@ public class CheckDataRender implements CartRenderStep { //商品上架状态判定 sku为空、sku非上架状态、sku审核不通过 boolean checkGoodsStatus = dataSku == null || !GoodsAuthEnum.PASS.name().equals(dataSku.getAuthFlag()) || !GoodsStatusEnum.UPPER.name().equals(dataSku.getMarketEnable()); //商品有效性判定 sku不为空且sku的更新时间不为空且sku的更新时间在购物车sku的更新时间之后 - boolean checkGoodsValid = dataSku != null && dataSku.getUpdateTime() != null && dataSku.getUpdateTime().after(cartSkuVO.getGoodsSku().getUpdateTime()); + boolean checkGoodsValid = dataSku != null && + dataSku.getUpdateTime() != null && + cartSkuVO.getGoodsSku() != null && + cartSkuVO.getGoodsSku().getUpdateTime() != null && + dataSku.getUpdateTime().after(cartSkuVO.getGoodsSku().getUpdateTime()); if (checkGoodsStatus || checkGoodsValid) { diff --git a/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java b/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java index 708400e7..4f574368 100644 --- a/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java @@ -281,22 +281,22 @@ public class EsGoodsSearchServiceImpl implements EsGoodsSearchService { List categoryNameBuckets = categoryNameAgg.getBuckets(); - String categoryNamePath = categoryPath; if (!categoryNameBuckets.isEmpty()) { - categoryNamePath = categoryNameBuckets.get(0).getKey().toString(); - } - String[] split = ArrayUtil.distinct(categoryPath.split(",")); - String[] nameSplit = categoryNamePath.split(","); - if (split.length == nameSplit.length) { - for (int i = 0; i < split.length; i++) { - SelectorOptions so = new SelectorOptions(); - so.setName(nameSplit[i]); - so.setValue(split[i]); - if (!categoryOptions.contains(so)) { - categoryOptions.add(so); + String categoryNamePath = categoryNameBuckets.get(0).getKey().toString(); + String[] split = ArrayUtil.distinct(categoryPath.split(",")); + String[] nameSplit = categoryNamePath.split(","); + if (split.length == nameSplit.length) { + for (int i = 0; i < split.length; i++) { + SelectorOptions so = new SelectorOptions(); + so.setName(nameSplit[i]); + so.setValue(split[i]); + if (!categoryOptions.contains(so)) { + categoryOptions.add(so); + } } } } + } return categoryOptions; }