diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartSkuVO.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartSkuVO.java index 1cef92e1..938c9fb3 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartSkuVO.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartSkuVO.java @@ -102,6 +102,9 @@ public class CartSkuVO extends CartBase implements Serializable { */ public CartSkuVO(GoodsSku goodsSku) { this.goodsSku = goodsSku; + if (goodsSku.getUpdateTime() == null) { + this.goodsSku.setUpdateTime(goodsSku.getCreateTime()); + } this.checked = true; this.invalid = false; //默认时间为0,让系统为此商品更新缓存 diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/AbstractPromotionsServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/AbstractPromotionsServiceImpl.java index 8d13a2e2..3a16eb86 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/AbstractPromotionsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/AbstractPromotionsServiceImpl.java @@ -112,6 +112,7 @@ public abstract class AbstractPromotionsServiceImpl, T e List promotionsList = this.list(new QueryWrapper().in("id", ids)); for (T t : promotionsList) { if (startTime != null && endTime != null) { + this.checkPromotions(t); t.setStartTime(new Date(startTime)); t.setEndTime(new Date(endTime)); } else { diff --git a/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsIndex.java b/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsIndex.java index 743b5dd5..493f594c 100644 --- a/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsIndex.java +++ b/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsIndex.java @@ -350,6 +350,11 @@ public class EsGoodsIndex implements Serializable { } } + public EsGoodsIndex(GoodsSku sku, Date createDate) { + this(sku); + this.releaseTime = createDate.getTime(); + } + public void setGoodsSku(GoodsSku sku) { if (sku != null) { this.id = sku.getId();