From a90f6b76e8ce1cb4f0d121d6cddaa2f93fcc322d Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Wed, 24 Jan 2024 15:04:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AB=99=E7=82=B9=E7=AE=A1=E7=90=86-=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E7=AE=A1=E7=90=86-=E4=BF=AE=E5=A4=8D=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E6=AC=A1=E6=95=B0=E5=88=A4=E6=96=AD=E6=9C=89=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/SiteLogMapper.xml             | 4 ++--
 .../miniProgram/service/impl/SiteInfoServiceImpl.java       | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/SiteLogMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/SiteLogMapper.xml
index 546c08a..25062f6 100644
--- a/flossom-common/flossom-common-core/src/main/resources/mapper/SiteLogMapper.xml
+++ b/flossom-common/flossom-common-core/src/main/resources/mapper/SiteLogMapper.xml
@@ -21,8 +21,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="userId != null "> and user_id = #{userId}</if>
             <if test="siteId != null "> and site_id = #{siteId}</if>
-            <if test="params != null and params.beginTime != null"> and create_time &gt;= #{params.beginTime},</if>
-            <if test="params != null and params.endTime != null"> and create_time &lt;= #{params.endTime},</if>
+            <if test="params != null and params.beginTime != null"> and create_time &gt;= #{params.beginTime}</if>
+            <if test="params != null and params.endTime != null"> and create_time &lt;= #{params.endTime}</if>
         </where>
     </select>
     
diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/SiteInfoServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/SiteInfoServiceImpl.java
index beba32f..dc00086 100644
--- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/SiteInfoServiceImpl.java
+++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/SiteInfoServiceImpl.java
@@ -277,7 +277,7 @@ public class SiteInfoServiceImpl implements ISiteInfoService {
             /* 5、推送频次 */
             Integer pushType = info.getPushType();
             if (info.getPushType() != null) {
-                // 5.1、每次进入，不用做判断
+                // 5.1、每次进入：每次页面刷新则展示，不用做判断
                 // 5.2、一次
                 if (SitePushTypeEnum.ONE.getCode() == pushType) {
                     SiteLog siteLog = new SiteLog();
@@ -293,7 +293,7 @@ public class SiteInfoServiceImpl implements ISiteInfoService {
                     // 判断当前日期的星期是否在规定范围内
                     String pushTimer = info.getPushTimer();
                     if (StringUtils.isNotBlank(pushTimer)) {
-                        List<String> weekList = Arrays.asList(pushTimer.split(","));
+                        List<Integer> weekList = Arrays.asList(pushTimer.split(",")).stream().map(Integer::valueOf).collect(Collectors.toList());
                         Calendar calendar = Calendar.getInstance();
                         // 获取当前星期几（1表示周日，2表示周一，依此类推）
                         int week = calendar.get(Calendar.DAY_OF_WEEK);
@@ -309,7 +309,7 @@ public class SiteInfoServiceImpl implements ISiteInfoService {
                         siteLog.getParams().put("beginTime", LocalDateTime.of(now.toLocalDate(), LocalTime.MIN));
                         siteLog.getParams().put("endTime", LocalDateTime.of(now.toLocalDate(), LocalTime.MAX));
                         List<SiteLog> siteLogs = siteLogMapper.selectSiteLogList(siteLog);
-                        if (siteLogs == null || siteLogs.size() >= info.getPushNumber()) {
+                        if (siteLogs != null && siteLogs.size() >= info.getPushNumber()) {
                             continue;
                         }
                     }