| @@ -3235,6 +3235,10 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| return wxRentContractMapper.findList(wrc); | return wxRentContractMapper.findList(wrc); | ||||
| } | } | ||||
| public static void main(String[] args) { | |||||
| System.out.println(DateUtils.getDayBegin(DateUtils.getFirstDayOfNextMonth(new Date(),-1))); | |||||
| } | |||||
| @Override | @Override | ||||
| public void calcuteByTradeDaily(WxRentContract wxRentContract) { | public void calcuteByTradeDaily(WxRentContract wxRentContract) { | ||||
| WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(wxRentContract); | WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(wxRentContract); | ||||
| @@ -3244,7 +3248,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| bq.setRentContractId(wxRentContract.getId()); | bq.setRentContractId(wxRentContract.getId()); | ||||
| bq.setIsPreview(EnumIsPreview.NO.getCode()); | bq.setIsPreview(EnumIsPreview.NO.getCode()); | ||||
| Date current = new Date(); | Date current = new Date(); | ||||
| bq.setEndtimeBegin(DateUtils.getDayBegin(DateUtils.getTimeAfterDays(-30, current))); | |||||
| //从上个月1号开始的都更新 | |||||
| bq.setEndtimeBegin(DateUtils.getDayBegin(DateUtils.getFirstDayOfNextMonth(current,-1))); | |||||
| bq.setEndtimeEnd(current); | bq.setEndtimeEnd(current); | ||||
| bq.setIsDel(EnumDelStatus.NOT_DEL.getCode()); | bq.setIsDel(EnumDelStatus.NOT_DEL.getCode()); | ||||
| List<WxBillRent> billList = wxBillRentMapper.findList(bq); | List<WxBillRent> billList = wxBillRentMapper.findList(bq); | ||||