diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicSignServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicSignServiceImpl.java index 4c5af1554..3df3ecb5e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicSignServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicSignServiceImpl.java @@ -130,7 +130,9 @@ public class WxCUserBasicSignServiceImpl implements WxCUserBasicSignService { calendar.set(Calendar.MINUTE, 0); calendar.set(Calendar.SECOND, 0); Date today = calendar.getTime();//今天零点 - calendar.set(DAY_OF_MONTH,calendar.get(DAY_OF_MONTH) +1); + calendar.set(Calendar.HOUR_OF_DAY, 23); + calendar.set(Calendar.MINUTE, 59); + calendar.set(Calendar.SECOND, 59); Date tomorrow =calendar.getTime();//明天零点 record.setStartDate(today); diff --git a/mallinkService/src/main/resources/mapper/WxActivityMapper.xml b/mallinkService/src/main/resources/mapper/WxActivityMapper.xml index 2a76f52a5..3835011a3 100644 --- a/mallinkService/src/main/resources/mapper/WxActivityMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxActivityMapper.xml @@ -94,7 +94,8 @@ - and `activity_start_time` >= #{startDate} and `activity_end_time` < #{endDate} + and ((`activity_start_time` >= #{startDate} and `activity_start_time` <= #{endDate}) + or (`activity_end_time` >= #{startDate} and `activity_end_time` <= #{endDate})) diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicSignMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicSignMapper.xml index ddab1de7a..7849f3a16 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicSignMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicSignMapper.xml @@ -54,7 +54,7 @@ and `signin_date` >= #{startDate} - and `signin_date` < #{endDate} + and `signin_date` <= #{endDate}