| @@ -272,6 +272,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||
| wxBillOtherDeposit.setPay(wxBillOtherDeposit.getPay() + owe); | |||
| wxBillOtherDeposit.setOwe(0L); | |||
| wxBillOtherDeposit.setStatus(EnumBillDailyStatus.PAID.getCode()); | |||
| wxBillOtherDeposit.setPayDate(date); | |||
| wxBillOtherDeposit.setUpdatetime(date); | |||
| wxBillOtherDeposit.setPayWay(EnumBillPayWay.WECHAT_PAY.getCode()); | |||
| int count = 0; | |||
| @@ -314,6 +315,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||
| wxBillOther.setPay(wxBillOther.getPay()+owe); | |||
| wxBillOther.setOwe(0L); | |||
| wxBillOther.setStatus(EnumBillDailyStatus.PAID.getCode()); | |||
| wxBillOther.setPayDate(date); | |||
| wxBillOther.setUpdatetime(date); | |||
| wxBillOther.setPayWay(EnumBillPayWay.WECHAT_PAY.getCode()); | |||
| int count = 0; | |||
| @@ -356,6 +358,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||
| wxBillDaily.setPay(wxBillDaily.getPay()+owe); | |||
| wxBillDaily.setOwe(0L); | |||
| wxBillDaily.setStatus(EnumBillDailyStatus.PAID.getCode()); | |||
| wxBillDaily.setPayDate(date); | |||
| wxBillDaily.setUpdatetime(date); | |||
| wxBillDaily.setPayWay(EnumBillPayWay.WECHAT_PAY.getCode()); | |||
| @@ -399,6 +402,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||
| wxBillPropertyDeposit.setPay(wxBillPropertyDeposit.getPay()+owe); | |||
| wxBillPropertyDeposit.setOwe(0L); | |||
| wxBillPropertyDeposit.setStatus(EnumBillDailyStatus.PAID.getCode()); | |||
| wxBillPropertyDeposit.setPayDate(date); | |||
| wxBillPropertyDeposit.setUpdatetime(date); | |||
| wxBillPropertyDeposit.setPayWay(EnumBillPayWay.WECHAT_PAY.getCode()); | |||
| @@ -442,6 +446,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||
| property.setPay(property.getPay()+owe); | |||
| property.setOwe(0L); | |||
| property.setStatus(EnumBillDailyStatus.PAID.getCode()); | |||
| property.setPayDate(date); | |||
| property.setUpdatetime(date); | |||
| property.setPayWay(EnumBillPayWay.WECHAT_PAY.getCode()); | |||
| @@ -485,6 +490,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||
| wxBillDeposit.setPay(wxBillDeposit.getPay()+owe); | |||
| wxBillDeposit.setOwe(0L); | |||
| wxBillDeposit.setStatus(EnumBillDailyStatus.PAID.getCode()); | |||
| wxBillDeposit.setPayDate(date); | |||
| wxBillDeposit.setUpdatetime(date); | |||
| wxBillDeposit.setPayWay(EnumBillPayWay.WECHAT_PAY.getCode()); | |||
| @@ -528,6 +534,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||
| wxBillRent.setPay(wxBillRent.getPay()+owe); | |||
| wxBillRent.setOwe(0L); | |||
| wxBillRent.setStatus(EnumBillDailyStatus.PAID.getCode()); | |||
| wxBillRent.setPayDate(date); | |||
| wxBillRent.setUpdatetime(date); | |||
| wxBillRent.setPayWay(EnumBillPayWay.WECHAT_PAY.getCode()); | |||
| @@ -128,12 +128,11 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { | |||
| if(pay>receivepay){ | |||
| return new ResultData(ErrorCode.BILL_PAY_ERROR.getCode(),"实收金额不能大于实际应收金额"); | |||
| } | |||
| Date date = new Date(); | |||
| if (record.getId() == null) { | |||
| logger.info("新增日常账单"); | |||
| final IdWorker idWorker = IdWorker.get(); | |||
| record.setId(idWorker.nextId()); | |||
| Date date = new Date(); | |||
| record.setStatus(record.getReceiveDate().after(date)?EnumBillDailyStatus.WAIT_PAY.getCode():EnumBillDailyStatus.NOT_PAID.getCode()); | |||
| record.setCreatetime(date); | |||
| record.setUpdatetime(date); | |||
| @@ -158,8 +157,11 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { | |||
| wxBillDaily.setPay(record.getPay()); | |||
| wxBillDaily.setReceivePay(record.getReceivePay()); | |||
| wxBillDaily.setOwe(record.getReceivePay()-record.getPay()); | |||
| wxBillDaily.setStatus(record.getPay().equals(record.getReceivePay()) ? EnumBillDailyStatus.PAID.getCode() : wxBillDaily.getStatus()); | |||
| wxBillDaily.setUpdatetime(new Date()); | |||
| if (record.getPay().equals(record.getReceivePay())) { | |||
| wxBillDaily.setStatus(EnumBillRentStatus.PAID.getCode()); | |||
| wxBillDaily.setPayDate(date); | |||
| } | |||
| wxBillDaily.setUpdatetime(date); | |||
| wxBillDaily.setPayWay(record.getPayWay()); | |||
| try { | |||
| wxBillDailyMapper.updateByPrimaryKeySelective(wxBillDaily); | |||
| @@ -106,11 +106,11 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { | |||
| if(pay>receivepay){ | |||
| return new ResultData(ErrorCode.BILL_PAY_ERROR.getCode(), "实收金额不能大于实际应收金额"); | |||
| } | |||
| Date date = new Date(); | |||
| if (record.getId() == null) { | |||
| logger.info("新增租赁押金账单"); | |||
| final IdWorker idWorker = IdWorker.get(); | |||
| record.setId(idWorker.nextId()); | |||
| Date date = new Date(); | |||
| record.setCreatetime(date); | |||
| record.setUpdatetime(date); | |||
| record.setOwe(record.getReceivePay()-record.getPay()); | |||
| @@ -133,7 +133,11 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { | |||
| wxBillDeposit.setPay(record.getPay()); | |||
| wxBillDeposit.setReceivePay(record.getReceivePay()); | |||
| wxBillDeposit.setOwe(record.getReceivePay()-record.getPay()); | |||
| wxBillDeposit.setStatus(record.getPay().equals(record.getReceivePay())?EnumBillRentStatus.PAID.getCode():wxBillDeposit.getStatus()); | |||
| if (record.getPay().equals(record.getReceivePay())) { | |||
| wxBillDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); | |||
| wxBillDeposit.setPayDate(date); | |||
| } | |||
| wxBillDeposit.setUpdatetime(date); | |||
| wxBillDeposit.setUpdatetime(new Date()); | |||
| wxBillDeposit.setPayWay(record.getPayWay()); | |||
| try { | |||
| @@ -120,11 +120,11 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService | |||
| if (pay > receivepay) { | |||
| return new ResultData(ErrorCode.BILL_PAY_ERROR.getCode(), "实收金额不能大于实际应收金额"); | |||
| } | |||
| Date date = new Date(); | |||
| if (record.getId() == null) { | |||
| logger.info("新增其他账单"); | |||
| final IdWorker idWorker = IdWorker.get(); | |||
| record.setId(idWorker.nextId()); | |||
| Date date = new Date(); | |||
| record.setStatus(EnumBillDailyStatus.WAIT_PAY.getCode()); | |||
| record.setCreatetime(date); | |||
| record.setUpdatetime(date); | |||
| @@ -149,8 +149,11 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService | |||
| wxBillOtherDeposit.setPay(record.getPay()); | |||
| wxBillOtherDeposit.setReceivePay(record.getReceivePay()); | |||
| wxBillOtherDeposit.setOwe(record.getReceivePay() - record.getPay()); | |||
| wxBillOtherDeposit.setStatus(record.getPay().equals(record.getReceivePay()) ? EnumBillDailyStatus.PAID.getCode() : wxBillOtherDeposit.getStatus()); | |||
| wxBillOtherDeposit.setUpdatetime(new Date()); | |||
| if (record.getPay().equals(record.getReceivePay())) { | |||
| wxBillOtherDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); | |||
| wxBillOtherDeposit.setPayDate(date); | |||
| } | |||
| wxBillOtherDeposit.setUpdatetime(date); | |||
| wxBillOtherDeposit.setPayWay(record.getPayWay()); | |||
| wxBillOtherDeposit.setComments(record.getComments()); | |||
| try { | |||
| @@ -119,11 +119,11 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { | |||
| if(pay>receivepay){ | |||
| return new ResultData(ErrorCode.BILL_PAY_ERROR,"实收金额不能大于实际应收金额"); | |||
| } | |||
| Date date = new Date(); | |||
| if (record.getId() == null) { | |||
| logger.info("新增其他账单"); | |||
| final IdWorker idWorker = IdWorker.get(); | |||
| record.setId(idWorker.nextId()); | |||
| Date date = new Date(); | |||
| record.setStatus(record.getReceiveDate().after(date)?EnumBillDailyStatus.WAIT_PAY.getCode():EnumBillDailyStatus.NOT_PAID.getCode()); | |||
| record.setCreatetime(date); | |||
| record.setUpdatetime(date); | |||
| @@ -148,8 +148,11 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { | |||
| wxBillOther.setPay(record.getPay()); | |||
| wxBillOther.setReceivePay(record.getReceivePay()); | |||
| wxBillOther.setOwe(record.getReceivePay()-record.getPay()); | |||
| wxBillOther.setStatus(record.getPay().equals(record.getReceivePay()) ? EnumBillDailyStatus.PAID.getCode() : wxBillOther.getStatus()); | |||
| wxBillOther.setUpdatetime(new Date()); | |||
| if (record.getPay().equals(record.getReceivePay())) { | |||
| wxBillOther.setStatus(EnumBillRentStatus.PAID.getCode()); | |||
| wxBillOther.setPayDate(date); | |||
| } | |||
| wxBillOther.setUpdatetime(date); | |||
| wxBillOther.setPayWay(record.getPayWay()); | |||
| wxBillOther.setComments(record.getComments()); | |||
| wxBillOther.setName(record.getName()); | |||
| @@ -106,11 +106,11 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe | |||
| if(pay>receivepay){ | |||
| return new ResultData(ErrorCode.BILL_PAY_ERROR.getCode(), "实收金额不能大于实际应收金额"); | |||
| } | |||
| Date date = new Date(); | |||
| if (record.getId() == null) { | |||
| logger.info("新增物业押金账单"); | |||
| final IdWorker idWorker = IdWorker.get(); | |||
| record.setId(idWorker.nextId()); | |||
| Date date = new Date(); | |||
| record.setCreatetime(date); | |||
| record.setUpdatetime(date); | |||
| record.setOwe(record.getReceivePay()-record.getPay()); | |||
| @@ -133,8 +133,11 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe | |||
| wxBillDeposit.setPay(record.getPay()); | |||
| wxBillDeposit.setReceivePay(record.getReceivePay()); | |||
| wxBillDeposit.setOwe(record.getReceivePay()-record.getPay()); | |||
| wxBillDeposit.setStatus(record.getPay().equals(record.getReceivePay())?EnumBillRentStatus.PAID.getCode():wxBillDeposit.getStatus()); | |||
| wxBillDeposit.setUpdatetime(new Date()); | |||
| if (record.getPay().equals(record.getReceivePay())) { | |||
| wxBillDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); | |||
| wxBillDeposit.setPayDate(date); | |||
| } | |||
| wxBillDeposit.setUpdatetime(date); | |||
| wxBillDeposit.setPayWay(record.getPayWay()); | |||
| try { | |||
| wxBillPropertyDepositMapper.updateByPrimaryKeySelective(wxBillDeposit); | |||
| @@ -105,11 +105,11 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { | |||
| if(pay>receivepay){ | |||
| return new ResultData(ErrorCode.BILL_PAY_ERROR,"实收金额不能大于实际应收金额"); | |||
| } | |||
| Date date = new Date(); | |||
| if (record.getId() == null) { | |||
| logger.info("新增物业账单"); | |||
| final IdWorker idWorker = IdWorker.get(); | |||
| record.setId(idWorker.nextId()); | |||
| Date date = new Date(); | |||
| record.setCreatetime(date); | |||
| record.setUpdatetime(date); | |||
| record.setOwe(record.getReceivePay()-record.getPay()); | |||
| @@ -135,8 +135,11 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { | |||
| property.setPay(record.getPay()); | |||
| property.setReceivePay(record.getReceivePay()); | |||
| property.setOwe(record.getReceivePay()-record.getPay()); | |||
| property.setStatus(record.getPay().equals(record.getReceivePay())?EnumBillRentStatus.PAID.getCode():property.getStatus()); | |||
| property.setUpdatetime(new Date()); | |||
| if (record.getPay().equals(record.getReceivePay())) { | |||
| property.setStatus(EnumBillRentStatus.PAID.getCode()); | |||
| property.setPayDate(date); | |||
| } | |||
| property.setUpdatetime(date); | |||
| property.setPayWay(record.getPayWay()); | |||
| try { | |||
| wxBillPropertyMapper.updateByPrimaryKeySelective(property); | |||
| @@ -105,11 +105,11 @@ public class WxBillRentServiceImpl implements WxBillRentService { | |||
| if(pay>receivepay){ | |||
| return new ResultData(ErrorCode.BILL_PAY_ERROR,"实收金额不能大于实际应收金额"); | |||
| } | |||
| Date date = new Date(); | |||
| if (record.getId() == null) { | |||
| logger.info("新增租赁账单"); | |||
| final IdWorker idWorker = IdWorker.get(); | |||
| record.setId(idWorker.nextId()); | |||
| Date date = new Date(); | |||
| record.setCreatetime(date); | |||
| record.setUpdatetime(date); | |||
| record.setOwe(record.getReceivePay()-record.getPay()); | |||
| @@ -131,12 +131,14 @@ public class WxBillRentServiceImpl implements WxBillRentService { | |||
| wxBillRent.setRevenue(record.getRevenue()); | |||
| wxBillRent.setLatePayRatio(record.getLatePayRatio()); | |||
| wxBillRent.setLatePayTime(record.getLatePayTime()); | |||
| wxBillRent.setPayDate(record.getPayDate()); | |||
| wxBillRent.setPay(record.getPay()); | |||
| wxBillRent.setReceivePay(record.getReceivePay()); | |||
| wxBillRent.setOwe(record.getReceivePay()-record.getPay()); | |||
| wxBillRent.setStatus(record.getPay().equals(record.getReceivePay())?EnumBillRentStatus.PAID.getCode():wxBillRent.getStatus()); | |||
| wxBillRent.setUpdatetime(new Date()); | |||
| if (record.getPay().equals(record.getReceivePay())) { | |||
| wxBillRent.setStatus(EnumBillRentStatus.PAID.getCode()); | |||
| wxBillRent.setPayDate(date); | |||
| } | |||
| wxBillRent.setUpdatetime(date); | |||
| wxBillRent.setPayWay(record.getPayWay()); | |||
| try { | |||
| wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent); | |||