diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java index 214af735d..baa30f46c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java @@ -54,7 +54,7 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { try { wxBillDepositMapper.updateWaitPayStatus(params); } catch (Exception e) { - logger.error("更新租赁待缴账单状态失败,e:" + e.getMessage()); + logger.error("更新租赁押金待缴账单状态失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); } } @@ -69,7 +69,7 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { try { wxBillDepositMapper.updateNotPaidStatus(params); } catch (Exception e) { - logger.error("更新租赁欠缴账单状态失败,e:" + e.getMessage()); + logger.error("更新租赁押金欠缴账单状态失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); } } @@ -85,7 +85,7 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { public ResultData saveOrUpdate(WxBillDeposit record) { if (record.getId() == null) { - logger.info("新增押金账单"); + logger.info("新增租赁押金账单"); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); Date date = new Date(); @@ -94,12 +94,12 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { try { wxBillDepositMapper.insertSelective(record); } catch (Exception e) { - logger.error("保存押金账单失败,e:" + e.getMessage()); + logger.error("保存租赁押金账单失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); } - return new ResultData(Result.SUCCESS, "保存押金账单成功"); + return new ResultData(Result.SUCCESS, "保存租赁押金账单成功"); } else { - logger.info("更新押金账单"); + logger.info("更新租赁押金账单"); WxBillDeposit wxBillDeposit = wxBillDepositMapper.selectByPrimaryKey(record.getId()); wxBillDeposit.setPayDate(record.getPayDate()); wxBillDeposit.setPay(record.getPay()*100); @@ -110,10 +110,10 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { try { wxBillDepositMapper.updateByPrimaryKeySelective(wxBillDeposit); } catch (Exception e) { - logger.error("更新押金账单失败,e:" + e.getMessage()); + logger.error("更新租赁押金账单失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); } - return new ResultData(Result.SUCCESS, "更新押金账单成功"); + return new ResultData(Result.SUCCESS, "更新租赁押金账单成功"); } } @@ -127,13 +127,16 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { public ResultData updatePaid(Long id) { WxBillDeposit wxBillDeposit = wxBillDepositMapper.selectByPrimaryKey(id); wxBillDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); + Date d =new Date(); + wxBillDeposit.setPayDate(d); + wxBillDeposit.setUpdatetime(d); try { wxBillDepositMapper.updateByPrimaryKeySelective(wxBillDeposit); } catch (Exception e) { - logger.error("押金结单失败,e:" + e.getMessage()); + logger.error("租赁押金结单失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); } - return new ResultData(Result.SUCCESS, "押金结单成功"); + return new ResultData(Result.SUCCESS, "租赁押金结单成功"); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java index d1bbbcdbc..50d5fe12e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java @@ -126,6 +126,9 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe public ResultData updatePaid(Long id) { WxBillPropertyDeposit wxBillDeposit = wxBillPropertyDepositMapper.selectByPrimaryKey(id); wxBillDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); + Date d =new Date(); + wxBillDeposit.setPayDate(d); + wxBillDeposit.setUpdatetime(d); try { wxBillPropertyDepositMapper.updateByPrimaryKeySelective(wxBillDeposit); } catch (Exception e) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java index 9ac45ec2f..218c5c4d6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java @@ -96,15 +96,15 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { return new ResultData(Result.SUCCESS, "保存物业账单成功"); } else { logger.info("更新物业账单"); - WxBillProperty wxBillRent = wxBillPropertyMapper.selectByPrimaryKey(record.getId()); - wxBillRent.setPayDate(record.getPayDate()); - wxBillRent.setPay(record.getPay()*100); - wxBillRent.setReceivePay(record.getReceivePay()*100); - wxBillRent.setOwe(record.getOwe()*100); - wxBillRent.setStatus(record.getPay().equals(record.getReceivePay())?EnumBillRentStatus.PAID.getCode():wxBillRent.getStatus()); - wxBillRent.setUpdatetime(new Date()); + WxBillProperty property = wxBillPropertyMapper.selectByPrimaryKey(record.getId()); + property.setPayDate(record.getPayDate()); + property.setPay(record.getPay()*100); + property.setReceivePay(record.getReceivePay()*100); + property.setOwe(record.getOwe()*100); + property.setStatus(record.getPay().equals(record.getReceivePay())?EnumBillRentStatus.PAID.getCode():property.getStatus()); + property.setUpdatetime(new Date()); try { - wxBillPropertyMapper.updateByPrimaryKeySelective(wxBillRent); + wxBillPropertyMapper.updateByPrimaryKeySelective(record); } catch (Exception e) { logger.error("更新物业账单失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); @@ -128,10 +128,13 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { @Transactional(rollbackFor = {Exception.class}) @Override public ResultData updatePaid(Long id) { - WxBillProperty wxBillRent = wxBillPropertyMapper.selectByPrimaryKey(id); - wxBillRent.setStatus(EnumBillRentStatus.PAID.getCode()); + WxBillProperty record = wxBillPropertyMapper.selectByPrimaryKey(id); + record.setStatus(EnumBillRentStatus.PAID.getCode()); + Date d =new Date(); + record.setPayDate(d); + record.setUpdatetime(d); try { - wxBillPropertyMapper.updateByPrimaryKeySelective(wxBillRent); + wxBillPropertyMapper.updateByPrimaryKeySelective(record); } catch (Exception e) { logger.error("结单失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index 0a46b817e..8ca725966 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -43,7 +43,6 @@ public class WxBillRentServiceImpl implements WxBillRentService { List> billRentList = wxBillRentMapper.queryBillRentList(record); PageInfo> pageInfo = new PageInfo<>(billRentList); return pageInfo; - //return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxBillRentMapper.findList(record)); } @Transactional(rollbackFor = {Exception.class}) @@ -56,7 +55,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { try { wxBillRentMapper.updateWaitPayStatus(params); } catch (Exception e) { - logger.error("更新租赁待缴账单状态失败,e:" + e.getMessage()); + logger.error("更新物业待缴账单状态失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); } } @@ -71,7 +70,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { try { wxBillRentMapper.updateNotPaidStatus(params); } catch (Exception e) { - logger.error("更新租赁欠缴账单状态失败,e:" + e.getMessage()); + logger.error("更新物业欠缴账单状态失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); } } @@ -86,7 +85,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { @Override public ResultData saveOrUpdate(WxBillRent record) { if (record.getId() == null) { - logger.info("新增租赁账单"); + logger.info("新增物业账单"); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); Date date = new Date(); @@ -95,12 +94,12 @@ public class WxBillRentServiceImpl implements WxBillRentService { try { wxBillRentMapper.insertSelective(record); } catch (Exception e) { - logger.error("保存租赁账单失败,e:" + e.getMessage()); + logger.error("保存物业账单失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); } - return new ResultData(Result.SUCCESS, "保存租赁账单成功"); + return new ResultData(Result.SUCCESS, "保存物业账单成功"); } else { - logger.info("更新租赁账单"); + logger.info("更新物业账单"); WxBillRent wxBillRent = wxBillRentMapper.selectByPrimaryKey(record.getId()); wxBillRent.setPayDate(record.getPayDate()); wxBillRent.setPay(record.getPay()*100); @@ -111,10 +110,10 @@ public class WxBillRentServiceImpl implements WxBillRentService { try { wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent); } catch (Exception e) { - logger.error("更新租赁账单失败,e:" + e.getMessage()); + logger.error("更新物业账单失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); } - return new ResultData(Result.SUCCESS, "更新租赁账单成功"); + return new ResultData(Result.SUCCESS, "更新物业账单成功"); } } @@ -135,13 +134,16 @@ public class WxBillRentServiceImpl implements WxBillRentService { public ResultData updatePaid(Long id) { WxBillRent wxBillRent = wxBillRentMapper.selectByPrimaryKey(id); wxBillRent.setStatus(EnumBillRentStatus.PAID.getCode()); + Date d =new Date(); + wxBillRent.setPayDate(d); + wxBillRent.setUpdatetime(d); try { wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent); } catch (Exception e) { - logger.error("结单失败,e:" + e.getMessage()); + logger.error("物业账单结单失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); } - return new ResultData(Result.SUCCESS, "结单成功"); + return new ResultData(Result.SUCCESS, "物业账单结单成功"); } }