diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index 0dd05115d..4ceee409c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -73,7 +73,7 @@ public class WxChartServiceImpl implements WxChartDataService { if (StringUtils.isEmpty(startdate)) { startdate = DateUtils.getSystemTime("yyyy-MM-dd") + " 00:00:00" ; } - if(StringUtils.isBlank(enddate)){ + if (StringUtils.isEmpty(enddate)) { enddate = DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59"; } @@ -1470,19 +1470,22 @@ public class WxChartServiceImpl implements WxChartDataService { WxCoupon wxCoupon = new WxCoupon(); //默认时间本月第一天,截止到当天 - if(paramsMap.get("startdate") == null || StringUtils.isBlank(paramsMap.get("startdate"))){ + if (StringUtils.isEmpty(paramsMap.get("startdate"))) { Calendar c = Calendar.getInstance(); c.add(Calendar.MONTH, 0); c.set(Calendar.DAY_OF_MONTH,1); + c.set(Calendar.HOUR_OF_DAY, 0); + c.set(Calendar.MINUTE, 0); + c.set(Calendar.SECOND, 0); wxCoupon.setStartdate(c.getTime()); }else{ Date startTime = DateUtils.stringToDate(startdate); wxCoupon.setStartdate(startTime); } - if(paramsMap.get("enddate") == null || StringUtils.isBlank(paramsMap.get("enddate"))){ - wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59")); + if (StringUtils.isEmpty(paramsMap.get("enddate"))) { + wxCoupon.setEnddate(new Date()); }else{ - Date endTime = DateUtils.stringToDate(enddate); + Date endTime = DateUtils.stringToDate(enddate, "yyyy-MM-dd HH:mm:ss"); wxCoupon.setEnddate(endTime); } @@ -1512,19 +1515,22 @@ public class WxChartServiceImpl implements WxChartDataService { Map result = new HashedMap(); //默认时间本月第一天,截止到当天 - if(paramsMap.get("startdate") == null || StringUtils.isBlank(paramsMap.get("startdate"))){ + if (StringUtils.isEmpty(paramsMap.get("startdate"))) { Calendar c = Calendar.getInstance(); c.add(Calendar.MONTH, 0); c.set(Calendar.DAY_OF_MONTH,1); + c.set(Calendar.HOUR_OF_DAY, 0); + c.set(Calendar.MINUTE, 0); + c.set(Calendar.SECOND, 0); wxCoupon.setStartdate(c.getTime()); }else{ Date startTime = DateUtils.stringToDate(startdate); wxCoupon.setStartdate(startTime); } - if(paramsMap.get("enddate") == null || StringUtils.isBlank(paramsMap.get("enddate"))){ - wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59")); + if (StringUtils.isEmpty(paramsMap.get("enddate"))) { + wxCoupon.setEnddate(new Date()); }else{ - Date endTime = DateUtils.stringToDate(enddate); + Date endTime = DateUtils.stringToDate(enddate, "yyyy-MM-dd HH:mm:ss"); wxCoupon.setEnddate(endTime); } List orderCountList = wxCouponService.findCouponOrderCount(wxCoupon); @@ -1566,19 +1572,22 @@ public class WxChartServiceImpl implements WxChartDataService { Map result = new HashedMap(); //默认时间本月第一天,截止到当天 - if(paramsMap.get("startdate") == null || StringUtils.isBlank(paramsMap.get("startdate"))){ + if (StringUtils.isEmpty(paramsMap.get("startdate"))) { Calendar c = Calendar.getInstance(); c.add(Calendar.MONTH, 0); c.set(Calendar.DAY_OF_MONTH,1); + c.set(Calendar.HOUR_OF_DAY, 0); + c.set(Calendar.MINUTE, 0); + c.set(Calendar.SECOND, 0); wxCoupon.setStartdate(c.getTime()); }else{ Date startTime = DateUtils.stringToDate(startdate); wxCoupon.setStartdate(startTime); } - if(paramsMap.get("enddate") == null || StringUtils.isBlank(paramsMap.get("enddate"))){ - wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59")); + if (StringUtils.isEmpty(paramsMap.get("enddate"))) { + wxCoupon.setEnddate(new Date()); }else{ - Date endTime = DateUtils.stringToDate(enddate); + Date endTime = DateUtils.stringToDate(enddate, "yyyy-MM-dd HH:mm:ss"); wxCoupon.setEnddate(endTime); } List pressSendHistory = wxCouponService.pressSendHistory(wxCoupon); @@ -1615,21 +1624,23 @@ public class WxChartServiceImpl implements WxChartDataService { Map result = new HashMap<>(); Date startTime = new Date(); Date endTime = startTime; - if (paramsMap.get("startdate") == null || StringUtils.isBlank(paramsMap.get("startdate"))) { + if (StringUtils.isEmpty(paramsMap.get("startdate"))) { Calendar c = Calendar.getInstance(); c.add(Calendar.MONTH, 0); c.set(Calendar.DAY_OF_MONTH, 1); + c.set(Calendar.HOUR_OF_DAY, 0); + c.set(Calendar.MINUTE, 0); + c.set(Calendar.SECOND, 0); startTime = c.getTime(); params.put("startdate", startTime); } else { startTime = DateUtils.stringToDate(startdate + " 00:00:00"); params.put("startdate", startTime); } - if (paramsMap.get("enddate") == null || StringUtils.isBlank(paramsMap.get("enddate"))) { + if (StringUtils.isEmpty(paramsMap.get("enddate"))) { params.put("enddate", endTime); } else { - endTime = DateUtils.stringToDate(enddate + " 23:59:59"); - params.put("enddate", endTime); + params.put("enddate", paramsMap.get("enddate") + " 23:59:59"); } List> successlist = wxOrderGroupMapper.queryOrderGroupSuccessCountAndTime(params);