Merge branch 'dev-wyp-20250310-getUser' of Server/growth-manager into master

common-module/src/main/java/com/tzld/piaoquan/growth/common/dao/mapper/ext/WeComUserMapperExt.java

@@ -12,5 +12,5 @@ import java.util.List;
 @Mapper
 @Repository
 public interface WeComUserMapperExt {
-    List<WeComUser> getGroupSendUserByDate(@Param("start") Date start);
+    List<WeComUser> getGroupSendUserByDate(@Param("start") Date start, @Param("end") Date end);
 }

common-module/src/main/java/com/tzld/piaoquan/growth/common/model/bo/GroupSendWeComUserParam.java

@@ -4,5 +4,5 @@ import lombok.Data;
 
 @Data
 public class GroupSendWeComUserParam {
-    String dateStart;
+    String dateStr;
 }

common-module/src/main/java/com/tzld/piaoquan/growth/common/service/Impl/WeComUserServiceImpl.java

@@ -251,10 +251,12 @@ public class WeComUserServiceImpl implements WeComUserService {
     @Override
     public List<WeComUserVo> getGroupSendWeComUser(GroupSendWeComUserParam param) {
         Date start = DateUtil.getDaysAgoDate(1);
-        if (Objects.nonNull(param) && StringUtils.isNotEmpty(param.getDateStart())) {
-            start = DateUtil.getDate(param.getDateStart());
+        Date end = DateUtil.getThatDayDate();
+        if (Objects.nonNull(param) && StringUtils.isNotEmpty(param.getDateStr())) {
+            start = DateUtil.getDate(param.getDateStr());
+            end = DateUtil.getDatePlusDays(param.getDateStr(), 1);
         }
-        List<WeComUser> list = weComUserMapperExt.getGroupSendUserByDate(start);
+        List<WeComUser> list = weComUserMapperExt.getGroupSendUserByDate(start, end);
         return buildWeComUserVo(list);
     }
 }

common-module/src/main/java/com/tzld/piaoquan/growth/common/utils/DateUtil.java

@@ -20,6 +20,7 @@ public class DateUtil {
         calendar.set(Calendar.HOUR_OF_DAY, 0);
         calendar.set(Calendar.MINUTE, 0);
         calendar.set(Calendar.SECOND, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
         return calendar.getTime();
     }
     public static Date getDaysAgoDate(int day) {
@@ -141,4 +142,12 @@ public class DateUtil {
         return Date.from(localDate.atStartOfDay(zone).toInstant());
     }
 
+    public static Date getDatePlusDays(String dateString, int plusDays) {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        LocalDate localDate = LocalDate.parse(dateString, formatter);
+        ZoneId zone = ZoneId.of("Asia/Shanghai");
+        localDate = localDate.plusDays(plusDays);
+        return Date.from(localDate.atStartOfDay(zone).toInstant());
+    }
+
 }

common-module/src/main/resources/mapper/ext/WeComUserMapperExt.xml

@@ -25,6 +25,6 @@
         from we_com_user wcu
         join we_com_send_message wcsm on wcsm.user_id = wcu.id
         where wcu.group_msg_disabled > 0
-        and wcsm.create_time > #{start}
+        and wcsm.create_time between #{start} and #{end}
     </select>
 </mapper>