From 38ad5bb394d3a578eca4c8e632d03b21fce24dc2 Mon Sep 17 00:00:00 2001
From: misworga831 <paulgao0831@gmail.com>
Date: Wed, 12 Apr 2023 16:13:29 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E4=BF=83=E9=94=80=E7=8A=B6=E6=80=81=E6=B5=81=E7=A8=8B=EF=BC=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BF=83=E9=94=80=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/lili/modules/order/cart/entity/vo/CartSkuVO.java | 3 +++
 .../promotion/serviceimpl/AbstractPromotionsServiceImpl.java | 1 +
 .../java/cn/lili/modules/search/entity/dos/EsGoodsIndex.java | 5 +++++
 3 files changed, 9 insertions(+)

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<M extends BaseMapper<T>, T e
         List<T> promotionsList = this.list(new QueryWrapper<T>().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();