Browse Source

sql

release_toaliyun_real
xhxu 5 years ago
parent
commit
2ed1f4f87a
2 changed files with 4 additions and 3 deletions
  1. +3
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/utils/DateUtils.java

+ 3
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java View File

@@ -269,12 +269,12 @@ public class WxActivityServiceImpl implements WxActivityService {
if(activityList != null){
for (WxActivity activity:activityList) {

Date start = activity.getActivityStartTime();
Date end = activity.getActivityEndTime();
Date start = DateUtils.getDateZero(activity.getActivityStartTime());
Date end = DateUtils.getDateZero(activity.getActivityEndTime());

Calendar dd = Calendar.getInstance();
dd.setTime(start);
while (start.getTime() < end.getTime()) {
while (start.getTime() <= end.getTime()) {
Map map = new HashMap<>();
map.put("yyyy", DateUtils.getYear(start));
map.put("mm", DateUtils.getMonth(start));


+ 1
- 0
mallinkService/src/main/java/com/iformall/utils/DateUtils.java View File

@@ -1374,6 +1374,7 @@ public class DateUtils {
cal.set(Calendar.HOUR_OF_DAY, 0);
cal.set(Calendar.MINUTE, 0);
cal.set(Calendar.SECOND, 0);
cal.set(Calendar.MILLISECOND, 0);
return cal.getTime();
}



Loading…
Cancel
Save