From 060bf5ec1edc90ccc251a7931b1922a0d336593b Mon Sep 17 00:00:00 2001 From: jason <250948568@qq.com> Date: Wed, 5 Jun 2024 15:27:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E7=AD=BE=E5=88=B0=E8=AE=B0=E5=BD=95=EF=BC=8C=E5=BD=93=E5=A4=A9?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E7=AD=BE=E5=88=B0=E5=89=8D=E4=B8=80=E5=A4=A9?= =?UTF-8?q?=E5=B7=B2=E7=AD=BE=E5=88=B0=EF=BC=8C=E8=BF=9E=E7=BB=AD=E7=AD=BE?= =?UTF-8?q?=E5=88=B0=E5=8D=B4=E4=B8=BA0=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/service/signin/MemberSignInRecordServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordServiceImpl.java index 01bb1f4291..565f5ca697 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordServiceImpl.java @@ -77,6 +77,10 @@ public class MemberSignInRecordServiceImpl implements MemberSignInRecordService // 4.1 校验今天是否签到,没有签到则直接返回 if (!summary.getTodaySignIn()) { + // 4.1.1 如果是昨天,设置连续签到天数 + if(DateUtils.isYesterday(lastRecord.getCreateTime())){ + summary.setContinuousDay(lastRecord.getDay()); + }; return summary; } // 4.2 连续签到天数 From 7af61a0000b06ea9ff6c2c96c17a2fab32a09317 Mon Sep 17 00:00:00 2001 From: jason <250948568@qq.com> Date: Sun, 16 Jun 2024 13:26:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=BC=9A=E5=91=98=E7=AD=BE=E5=88=B0=E8=AE=B0=E5=BD=95=EF=BC=8C?= =?UTF-8?q?=E5=BD=93=E5=A4=A9=E6=B2=A1=E6=9C=89=E7=AD=BE=E5=88=B0=E5=89=8D?= =?UTF-8?q?=E4=B8=80=E5=A4=A9=E5=B7=B2=E7=AD=BE=E5=88=B0=EF=BC=8C=E8=BF=9E?= =?UTF-8?q?=E7=BB=AD=E7=AD=BE=E5=88=B0=E5=8D=B4=E4=B8=BA0=E7=9A=84bug?= =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/signin/MemberSignInRecordServiceImpl.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordServiceImpl.java index 565f5ca697..d7c2b876f3 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordServiceImpl.java @@ -75,15 +75,12 @@ public class MemberSignInRecordServiceImpl implements MemberSignInRecordService } summary.setTodaySignIn(DateUtils.isToday(lastRecord.getCreateTime())); - // 4.1 校验今天是否签到,没有签到则直接返回 - if (!summary.getTodaySignIn()) { - // 4.1.1 如果是昨天,设置连续签到天数 - if(DateUtils.isYesterday(lastRecord.getCreateTime())){ - summary.setContinuousDay(lastRecord.getDay()); - }; + // 4.1 检查今天是否未签到且记录不是昨天创建的,如果是则直接返回 + if (!summary.getTodaySignIn() && !DateUtils.isYesterday(lastRecord.getCreateTime())) { return summary; } - // 4.2 连续签到天数 + + // 4.2 要么是今天签到了,要么是昨天的记录,设置连续签到天数 summary.setContinuousDay(lastRecord.getDay()); return summary; }