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/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java index 9892de836..57ecf5da7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -122,6 +122,10 @@ public class TenantInfoImpl implements TenantInfo { return true; if ("com.iformall.mapper.WxBillPropertyMapper.autoAddLatePayPrice".equals(ms.getId())) return true; + if ("com.iformall.mapper.WxBillRentMapper.insertBillAction".equals(ms.getId())) + return true; + if ("com.iformall.mapper.WxBillPropertyMapper.insertBillAction".equals(ms.getId())) + return true; return false; } } 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 85c543de4..d28632473 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -2220,7 +2220,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); @@ -2265,7 +2265,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); @@ -2331,7 +2331,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); @@ -2382,16 +2382,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 @@ -2407,7 +2397,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/WxBillPropertyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml index c536190ea..c38034b86 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml @@ -227,7 +227,7 @@ - insert into wx_bill_action(id,user_name,`action`,bill_id,details) + insert into wx_bill_action(id,user_name,`action`,bill_id,details,tenant_id) select (select unix_timestamp(now()) + CEILING(RAND()*90000+10000)) id ,'系统端' user_name,7 `action`,b.id bill_id, @@ -241,7 +241,7 @@ b.owe * (c.late_pay_ratio) /10000 ,2) ) - ,'元') details + ,'元') details,b.tenant_id from wx_bill_property b left join wx_property_contract c on(b.`property_contract_id`=c.id) where c.late_pay_ratio >0 and DATEDIFF(now(), date_add(b.receive_date,interval(c.late_pay_day) day)) >0 diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index 8d20ec925..39a6e6190 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -229,7 +229,7 @@ - insert into wx_bill_action(id,user_name,`action`,bill_id,details) + insert into wx_bill_action(id,user_name,`action`,bill_id,details,tenant_id) select (select unix_timestamp(now()) + CEILING(RAND()*90000+10000)) id ,'系统端' user_name,7 `action`,b.id bill_id, @@ -243,7 +243,7 @@ b.owe * (c.late_pay_ratio) /10000 ,2) ) - ,'元') details + ,'元') details,b.tenant_id from wx_bill_rent b left join wx_rent_contract c on(b.rent_contract_id=c.id) where c.late_pay_ratio >0 and DATEDIFF(now(), date_add(b.receive_date,interval(c.late_pay_day) day)) >0 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 @@