From bf667e2aa60cf81ac2d6a2acf47398e802e85336 Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Thu, 31 Mar 2022 09:21:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=BE=E5=88=B0=E9=97=AE=E9=A2=98=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DB/version4.2.3to4.2.4.sql                               | 6 ++++--
 ...version4.2.3toMASTER.sql => version4.2.4toMASTER.sql} | 0
 .../src/main/java/cn/lili/common/utils/DateUtil.java     | 9 +++++++++
 .../cn/lili/modules/member/entity/dos/MemberSign.java    | 4 ++++
 .../member/serviceimpl/MemberSignServiceImpl.java        | 4 ++--
 .../cn/lili/mybatis/mybatisplus/MyMetaObjectHandler.java | 3 +--
 6 files changed, 20 insertions(+), 6 deletions(-)
 rename DB/{version4.2.3toMASTER.sql => version4.2.4toMASTER.sql} (100%)

diff --git a/DB/version4.2.3to4.2.4.sql b/DB/version4.2.3to4.2.4.sql
index 78764222..f8cfb17a 100644
--- a/DB/version4.2.3to4.2.4.sql
+++ b/DB/version4.2.3to4.2.4.sql
@@ -1,2 +1,4 @@
-/** 新增已退货数量 **/
-ALTER TABLE li_order_item ADD return_goods_number int DEFAULT 0 COMMENT '退货数量 ';
\ No newline at end of file
+/** 增加签到日期 **/
+ALTER TABLE li_member_sign ADD day int DEFAULT NULL COMMENT '签到日 ';
+ALTER TABLE li_member_sign DROP INDEX uk_member_day;
+ALTER TABLE li_member_sign add unique uk_member_day (member_id, day) COMMENT 'uk_member_day';
\ No newline at end of file
diff --git a/DB/version4.2.3toMASTER.sql b/DB/version4.2.4toMASTER.sql
similarity index 100%
rename from DB/version4.2.3toMASTER.sql
rename to DB/version4.2.4toMASTER.sql
diff --git a/framework/src/main/java/cn/lili/common/utils/DateUtil.java b/framework/src/main/java/cn/lili/common/utils/DateUtil.java
index b07f0bde..34a29c89 100644
--- a/framework/src/main/java/cn/lili/common/utils/DateUtil.java
+++ b/framework/src/main/java/cn/lili/common/utils/DateUtil.java
@@ -20,6 +20,15 @@ public class DateUtil {
     public static final String FULL_DATE = "yyyyMMddHHmmss";
 
 
+    /**
+     * 当天的开始时间
+     *
+     * @return 今天开始时间
+     */
+    public static Long getDayOfStart() {
+        return DateUtil.getDateline()/(60*24*60);
+    }
+
     /**
      * 当天的开始时间
      *
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberSign.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberSign.java
index adec8b76..504975ca 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberSign.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberSign.java
@@ -42,4 +42,8 @@ public class MemberSign extends BaseIdEntity {
     @ApiModelProperty(value = "连续签到天数")
     private Integer signDay;
 
+
+    @ApiModelProperty(value = "签到日 为数字 从现在减去19700101 的日期")
+    private Integer day;
+
 }
diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberSignServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberSignServiceImpl.java
index fbac26ba..c25f4145 100644
--- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberSignServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberSignServiceImpl.java
@@ -77,8 +77,8 @@ public class MemberSignServiceImpl extends ServiceImpl<MemberSignMapper, MemberS
             } else {
                 memberSign.setSignDay(1);
             }
-            //手动写入创建时间，以保证唯一索引生效
-            memberSign.setCreateTime(DateUtil.getCurrentDayEndTime());
+
+            memberSign.setDay(DateUtil.getDayOfStart().intValue());
             try {
                 this.baseMapper.insert(memberSign);
                 //签到成功后发送消息赠送积分
diff --git a/framework/src/main/java/cn/lili/mybatis/mybatisplus/MyMetaObjectHandler.java b/framework/src/main/java/cn/lili/mybatis/mybatisplus/MyMetaObjectHandler.java
index 5451c8e1..eadaa7e3 100644
--- a/framework/src/main/java/cn/lili/mybatis/mybatisplus/MyMetaObjectHandler.java
+++ b/framework/src/main/java/cn/lili/mybatis/mybatisplus/MyMetaObjectHandler.java
@@ -27,8 +27,7 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
             this.setFieldValByName("createBy", "SYSTEM", metaObject);
         }
         //有创建时间字段，切字段值为空
-        if (metaObject.hasGetter("createTime")
-                && metaObject.getValue("createTime") == null) {
+        if (metaObject.hasGetter("createTime")) {
             this.setFieldValByName("createTime", new Date(), metaObject);
         }
         //有值，则写入