| @@ -468,9 +468,9 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| private void updateBillStatus(WxBillAll record) { | private void updateBillStatus(WxBillAll record) { | ||||
| logger.info("更新各账单状态开始"); | logger.info("更新各账单状态开始"); | ||||
| //更新其他押金账单 | //更新其他押金账单 | ||||
| WxBillOtherDeposit wxBillOtherDeposit = new WxBillOtherDeposit(); | |||||
| wxBillOtherDeposit.setTenantId(record.getTenantId()); | |||||
| wxBillOtherDepositService.updateBillStatus(wxBillOtherDeposit); | |||||
| //WxBillOtherDeposit wxBillOtherDeposit = new WxBillOtherDeposit(); | |||||
| //wxBillOtherDeposit.setTenantId(record.getTenantId()); | |||||
| //wxBillOtherDepositService.updateBillStatus(wxBillOtherDeposit); | |||||
| //更新其他账单 | //更新其他账单 | ||||
| WxBillOther wxBillOther = new WxBillOther(); | WxBillOther wxBillOther = new WxBillOther(); | ||||
| wxBillOther.setTenantId(record.getTenantId()); | wxBillOther.setTenantId(record.getTenantId()); | ||||
| @@ -480,13 +480,13 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| wxBillDaily.setTenantId(record.getTenantId()); | wxBillDaily.setTenantId(record.getTenantId()); | ||||
| wxBillDailyService.updateBillStatus(wxBillDaily); | wxBillDailyService.updateBillStatus(wxBillDaily); | ||||
| //更新租赁押金账单状态 | //更新租赁押金账单状态 | ||||
| WxBillDeposit wxBillDeposit = new WxBillDeposit(); | |||||
| wxBillDeposit.setTenantId(record.getTenantId()); | |||||
| wxBillDepositService.updateBillStatus(wxBillDeposit); | |||||
| //WxBillDeposit wxBillDeposit = new WxBillDeposit(); | |||||
| //wxBillDeposit.setTenantId(record.getTenantId()); | |||||
| //wxBillDepositService.updateBillStatus(wxBillDeposit); | |||||
| //更新物业押金账单状态 | //更新物业押金账单状态 | ||||
| WxBillPropertyDeposit wxBillPropertyDeposit = new WxBillPropertyDeposit(); | |||||
| wxBillPropertyDeposit.setTenantId(record.getTenantId()); | |||||
| wxBillPropertyDepositService.updateBillStatus(wxBillPropertyDeposit); | |||||
| //WxBillPropertyDeposit wxBillPropertyDeposit = new WxBillPropertyDeposit(); | |||||
| //wxBillPropertyDeposit.setTenantId(record.getTenantId()); | |||||
| //wxBillPropertyDepositService.updateBillStatus(wxBillPropertyDeposit); | |||||
| //更新物业账单状态 | //更新物业账单状态 | ||||
| WxBillProperty wxBillProperty = new WxBillProperty(); | WxBillProperty wxBillProperty = new WxBillProperty(); | ||||
| wxBillProperty.setTenantId(record.getTenantId()); | wxBillProperty.setTenantId(record.getTenantId()); | ||||
| @@ -37,7 +37,7 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { | |||||
| @Override | @Override | ||||
| public PageInfo<Map<String, Object>> listAsPage(WxBillDeposit record, Integer pageIndex, Integer pageSize) { | public PageInfo<Map<String, Object>> listAsPage(WxBillDeposit record, Integer pageIndex, Integer pageSize) { | ||||
| //更新账单状态 | //更新账单状态 | ||||
| updateBillStatus(record); | |||||
| //updateBillStatus(record); | |||||
| PageHelper.startPage(pageIndex, pageSize); | PageHelper.startPage(pageIndex, pageSize); | ||||
| List<Map<String, Object>> billDepositList = wxBillDepositMapper.queryBillDepositList(record); | List<Map<String, Object>> billDepositList = wxBillDepositMapper.queryBillDepositList(record); | ||||
| PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(billDepositList); | PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(billDepositList); | ||||
| @@ -39,7 +39,7 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService | |||||
| @Override | @Override | ||||
| public PageInfo<Map<String, Object>> listAsPage(WxBillOtherDeposit record, Integer pageIndex, Integer pageSize) { | public PageInfo<Map<String, Object>> listAsPage(WxBillOtherDeposit record, Integer pageIndex, Integer pageSize) { | ||||
| //更新账单状态 | //更新账单状态 | ||||
| updateBillStatus(record); | |||||
| //updateBillStatus(record); | |||||
| //分页对象设置页数和条数 | //分页对象设置页数和条数 | ||||
| PageHelper.startPage(pageIndex, pageSize); | PageHelper.startPage(pageIndex, pageSize); | ||||
| //查询 | //查询 | ||||
| @@ -119,7 +119,7 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService | |||||
| final IdWorker idWorker = IdWorker.get(); | final IdWorker idWorker = IdWorker.get(); | ||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| Date date = new Date(); | Date date = new Date(); | ||||
| record.setStatus(record.getReceiveDate().after(date) ? EnumBillDailyStatus.WAIT_PAY.getCode() : EnumBillDailyStatus.NOT_PAID.getCode()); | |||||
| record.setStatus(EnumBillDailyStatus.WAIT_PAY.getCode()); | |||||
| record.setCreatetime(date); | record.setCreatetime(date); | ||||
| record.setUpdatetime(date); | record.setUpdatetime(date); | ||||
| record.setExpiredDay(0L); | record.setExpiredDay(0L); | ||||
| @@ -37,7 +37,7 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe | |||||
| @Override | @Override | ||||
| public PageInfo<Map<String, Object>> listAsPage(WxBillPropertyDeposit record, Integer pageIndex, Integer pageSize) { | public PageInfo<Map<String, Object>> listAsPage(WxBillPropertyDeposit record, Integer pageIndex, Integer pageSize) { | ||||
| //更新账单状态 | //更新账单状态 | ||||
| updateBillStatus(record); | |||||
| //updateBillStatus(record); | |||||
| PageHelper.startPage(pageIndex, pageSize); | PageHelper.startPage(pageIndex, pageSize); | ||||
| List<Map<String, Object>> billDepositList = wxBillPropertyDepositMapper.queryBillDepositList(record); | List<Map<String, Object>> billDepositList = wxBillPropertyDepositMapper.queryBillDepositList(record); | ||||
| PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(billDepositList); | PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(billDepositList); | ||||