diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index de7a173d8..dabec7127 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -272,10 +272,7 @@ public class WxCouponController extends BaseController { //默认时间本月第一天,截止到当天 Map result = new HashedMap(); if(wxCoupon.getStartdate() == null){ - Calendar c = Calendar.getInstance(); - c.add(Calendar.MONTH, 0); - c.set(Calendar.DAY_OF_MONTH,1); - wxCoupon.setStartdate(c.getTime()); + wxCoupon.setStartdate(DateUtils.getFirstDayForCurrMonth()); } if(wxCoupon.getEnddate() == null){ wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59")); @@ -296,7 +293,7 @@ public class WxCouponController extends BaseController { return new ResultData(result); } - @ApiOperation("卷营销列表接口") + @ApiOperation("券营销列表接口") @GetMapping("findCouponCountList") @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @@ -306,10 +303,7 @@ public class WxCouponController extends BaseController { //默认时间本月第一天,截止到当天 Map result = new HashedMap(); if(wxCoupon.getStartdate() == null){ - Calendar c = Calendar.getInstance(); - c.add(Calendar.MONTH, 0); - c.set(Calendar.DAY_OF_MONTH,1); - wxCoupon.setStartdate(c.getTime()); + wxCoupon.setStartdate(DateUtils.getFirstDayForCurrMonth()); } if(wxCoupon.getEnddate() == null){ wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59")); @@ -334,13 +328,9 @@ public class WxCouponController extends BaseController { @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) @SystemControllerLog(description = "券投放-砍价营销列表") public ResultData findPressCountList(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { - //默认时间本月第一天,截止到当天 Map result = new HashedMap(); if(wxCoupon.getStartdate() == null){ - Calendar c = Calendar.getInstance(); - c.add(Calendar.MONTH, 0); - c.set(Calendar.DAY_OF_MONTH,1); - wxCoupon.setStartdate(c.getTime()); + wxCoupon.setStartdate(DateUtils.getFirstDayForCurrMonth()); } if(wxCoupon.getEnddate() == null){ wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59")); 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 ed4ade030..7698bd322 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -2219,7 +2219,7 @@ public class WxChartServiceImpl implements WxChartDataService { //默认时间本月第一天,截止到当天 if (StringUtils.isEmpty(paramsMap.get("startdate"))) { - wxCoupon.setStartdate(getMonthFirstDay()); + wxCoupon.setStartdate(DateUtils.getFirstDayForCurrMonth()); }else{ Date startTime = DateUtils.stringToDate(startdate); wxCoupon.setStartdate(startTime); @@ -2264,7 +2264,7 @@ public class WxChartServiceImpl implements WxChartDataService { //默认时间本月第一天,截止到当天 if (StringUtils.isEmpty(paramsMap.get("startdate"))) { - wxCoupon.setStartdate(getMonthFirstDay()); + wxCoupon.setStartdate(DateUtils.getFirstDayForCurrMonth()); }else{ Date startTime = DateUtils.stringToDate(startdate); wxCoupon.setStartdate(startTime); @@ -2330,7 +2330,7 @@ public class WxChartServiceImpl implements WxChartDataService { //默认时间本月第一天,截止到当天 if (StringUtils.isEmpty(paramsMap.get("startdate"))) { - wxCoupon.setStartdate(getMonthFirstDay()); + wxCoupon.setStartdate(DateUtils.getFirstDayForCurrMonth()); }else{ Date startTime = DateUtils.stringToDate(startdate); wxCoupon.setStartdate(startTime); @@ -2381,16 +2381,6 @@ public class WxChartServiceImpl implements WxChartDataService { return tatal; } - private Date getMonthFirstDay() { - 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); - return c.getTime(); - } - /** * 拼团营销数据 * @param paramsMap @@ -2406,7 +2396,7 @@ public class WxChartServiceImpl implements WxChartDataService { Date startTime = new Date(); Date endTime = startTime; if (StringUtils.isEmpty(paramsMap.get("startdate"))) { - startTime = getMonthFirstDay(); + startTime = DateUtils.getFirstDayForCurrMonth(); params.put("startdate", startTime); } else { startTime = DateUtils.stringToDate(startdate + " 00:00:00"); diff --git a/mallinkService/src/main/java/com/iformall/utils/DateUtils.java b/mallinkService/src/main/java/com/iformall/utils/DateUtils.java index 1ebb1c109..14e20cba2 100755 --- a/mallinkService/src/main/java/com/iformall/utils/DateUtils.java +++ b/mallinkService/src/main/java/com/iformall/utils/DateUtils.java @@ -985,7 +985,12 @@ public class DateUtils { */ public static Date getFirstDayForCurrMonth(){ Calendar cale = Calendar.getInstance(); + cale.add(Calendar.MONTH, 0); cale.set(Calendar.DAY_OF_MONTH,1);//设置为1号,当前日期既为本月第一天 + cale.set(Calendar.HOUR_OF_DAY, 0); //将小时至0 + cale.set(Calendar.MINUTE, 0); //将分钟至0 + cale.set(Calendar.SECOND,0); //将秒至0 + cale.set(Calendar.MILLISECOND, 0); //将毫秒至0 return cale.getTime(); } /** diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 14ba453c0..52cfc7a5b 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -654,20 +654,20 @@