From 478ba2048a50ddd316a2020b6f1efaff589fe46a Mon Sep 17 00:00:00 2001
From: paulGao <paulgao0831@gmail.com>
Date: Thu, 9 Jun 2022 09:13:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81=E6=9C=89?=
 =?UTF-8?q?=E6=95=88=E6=80=A7=E5=88=A4=E5=AE=9A=E4=B8=AD=EF=BC=8C=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E5=95=86=E5=93=81=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=AF=94=E8=BE=83=E6=94=B9=E4=B8=BA=E5=95=86=E5=93=81=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E6=97=B6=E9=97=B4=E6=AF=94=E8=BE=83=EF=BC=88=E5=9B=A0?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=95=86=E5=93=81=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E6=AF=8F=E6=AC=A1=E9=83=BD=E6=98=AF?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=90=8E=E6=96=B0=E5=A2=9E=EF=BC=8C=E6=89=80?=
 =?UTF-8?q?=E4=BB=A5=E6=97=A0=E5=95=86=E5=93=81=E6=9B=B4=E6=96=B0=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/lili/modules/goods/entity/dos/GoodsSku.java     | 6 +++---
 .../modules/order/cart/render/impl/CheckDataRender.java     | 2 +-
 .../cn/lili/modules/order/cart/service/CartServiceImpl.java | 2 +-
 framework/src/main/java/cn/lili/mybatis/BaseEntity.java     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java
index ebe97e91..0c89fdc1 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java
@@ -171,11 +171,11 @@ public class GoodsSku extends BaseEntity {
     }
 
     @Override
-    public Date getUpdateTime() {
-        if (super.getUpdateTime() == null) {
+    public Date getCreateTime() {
+        if (super.getCreateTime() == null) {
             return new Date(1593571928);
         } else {
-            return super.getUpdateTime();
+            return super.getCreateTime();
         }
     }
 
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 8cb02a48..5b5fb2a7 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
@@ -107,7 +107,7 @@ public class CheckDataRender implements CartRenderStep {
             //缓存中的商品信息
             GoodsSku dataSku = goodsSkuService.getGoodsSkuByIdFromCache(cartSkuVO.getGoodsSku().getId());
             //商品有效性判定
-            if (dataSku == null || dataSku.getUpdateTime().before(cartSkuVO.getGoodsSku().getUpdateTime())) {
+            if (dataSku == null || dataSku.getCreateTime().after(cartSkuVO.getGoodsSku().getCreateTime())) {
                 //设置购物车未选中
                 cartSkuVO.setChecked(false);
                 //设置购物车此sku商品已失效
diff --git a/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java
index 7b44ed78..3a45ded2 100644
--- a/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java
@@ -150,7 +150,7 @@ public class CartServiceImpl implements CartService {
 
 
                 //购物车中已经存在，更新数量
-                if (cartSkuVO != null && dataSku.getUpdateTime().equals(cartSkuVO.getGoodsSku().getUpdateTime())) {
+                if (cartSkuVO != null && dataSku.getCreateTime().equals(cartSkuVO.getGoodsSku().getCreateTime())) {
 
                     //如果覆盖购物车中商品数量
                     if (Boolean.TRUE.equals(cover)) {
diff --git a/framework/src/main/java/cn/lili/mybatis/BaseEntity.java b/framework/src/main/java/cn/lili/mybatis/BaseEntity.java
index ab73d591..126c6cbc 100644
--- a/framework/src/main/java/cn/lili/mybatis/BaseEntity.java
+++ b/framework/src/main/java/cn/lili/mybatis/BaseEntity.java
@@ -64,7 +64,7 @@ public abstract class BaseEntity implements Serializable {
     @LastModifiedDate
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(fill = FieldFill.UPDATE)
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     @ApiModelProperty(value = "更新时间", hidden = true)
     @Field(type = FieldType.Date, format = DateFormat.custom, pattern = "yyyy-MM-dd HH:mm:ss || yyyy-MM-dd || yyyy/MM/dd HH:mm:ss|| yyyy/MM/dd ||epoch_millis")
     private Date updateTime;