| @@ -159,8 +159,8 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { | |||||
| wxBillDaily.setOwe(record.getReceivePay()-record.getPay()); | wxBillDaily.setOwe(record.getReceivePay()-record.getPay()); | ||||
| if (record.getPay().equals(record.getReceivePay())) { | if (record.getPay().equals(record.getReceivePay())) { | ||||
| wxBillDaily.setStatus(EnumBillRentStatus.PAID.getCode()); | wxBillDaily.setStatus(EnumBillRentStatus.PAID.getCode()); | ||||
| wxBillDaily.setPayDate(date); | |||||
| } | } | ||||
| wxBillDaily.setPayDate(record.getPayDate()); | |||||
| wxBillDaily.setUpdatetime(date); | wxBillDaily.setUpdatetime(date); | ||||
| wxBillDaily.setPayWay(record.getPayWay()); | wxBillDaily.setPayWay(record.getPayWay()); | ||||
| try { | try { | ||||
| @@ -180,6 +180,7 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { | |||||
| wxBillAction.setUserName(user.getName()); | wxBillAction.setUserName(user.getName()); | ||||
| wxBillAction.setPhone(user.getPhone()); | wxBillAction.setPhone(user.getPhone()); | ||||
| wxBillAction.setTenantId(wxBillDaily.getTenantId()); | wxBillAction.setTenantId(wxBillDaily.getTenantId()); | ||||
| wxBillAction.setPayDate(wxBillDaily.getPayDate()); | |||||
| try { | try { | ||||
| wxBillActionService.save(wxBillAction); | wxBillActionService.save(wxBillAction); | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| @@ -135,8 +135,8 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { | |||||
| wxBillDeposit.setOwe(record.getReceivePay()-record.getPay()); | wxBillDeposit.setOwe(record.getReceivePay()-record.getPay()); | ||||
| if (record.getPay().equals(record.getReceivePay())) { | if (record.getPay().equals(record.getReceivePay())) { | ||||
| wxBillDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); | wxBillDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); | ||||
| wxBillDeposit.setPayDate(date); | |||||
| } | } | ||||
| wxBillDeposit.setPayDate(record.getPayDate()); | |||||
| wxBillDeposit.setUpdatetime(date); | wxBillDeposit.setUpdatetime(date); | ||||
| wxBillDeposit.setUpdatetime(new Date()); | wxBillDeposit.setUpdatetime(new Date()); | ||||
| wxBillDeposit.setPayWay(record.getPayWay()); | wxBillDeposit.setPayWay(record.getPayWay()); | ||||
| @@ -157,6 +157,7 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { | |||||
| wxBillAction.setUserName(user.getName()); | wxBillAction.setUserName(user.getName()); | ||||
| wxBillAction.setPhone(user.getPhone()); | wxBillAction.setPhone(user.getPhone()); | ||||
| wxBillAction.setTenantId(wxBillDeposit.getTenantId()); | wxBillAction.setTenantId(wxBillDeposit.getTenantId()); | ||||
| wxBillAction.setPayDate(wxBillDeposit.getPayDate()); | |||||
| try { | try { | ||||
| wxBillActionService.save(wxBillAction); | wxBillActionService.save(wxBillAction); | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| @@ -151,8 +151,8 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService | |||||
| wxBillOtherDeposit.setOwe(record.getReceivePay() - record.getPay()); | wxBillOtherDeposit.setOwe(record.getReceivePay() - record.getPay()); | ||||
| if (record.getPay().equals(record.getReceivePay())) { | if (record.getPay().equals(record.getReceivePay())) { | ||||
| wxBillOtherDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); | wxBillOtherDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); | ||||
| wxBillOtherDeposit.setPayDate(date); | |||||
| } | } | ||||
| wxBillOtherDeposit.setPayDate(record.getPayDate()); | |||||
| wxBillOtherDeposit.setUpdatetime(date); | wxBillOtherDeposit.setUpdatetime(date); | ||||
| wxBillOtherDeposit.setPayWay(record.getPayWay()); | wxBillOtherDeposit.setPayWay(record.getPayWay()); | ||||
| wxBillOtherDeposit.setComments(record.getComments()); | wxBillOtherDeposit.setComments(record.getComments()); | ||||
| @@ -173,6 +173,7 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService | |||||
| wxBillAction.setUserName(user.getName()); | wxBillAction.setUserName(user.getName()); | ||||
| wxBillAction.setPhone(user.getPhone()); | wxBillAction.setPhone(user.getPhone()); | ||||
| wxBillAction.setTenantId(wxBillOtherDeposit.getTenantId()); | wxBillAction.setTenantId(wxBillOtherDeposit.getTenantId()); | ||||
| wxBillAction.setPayDate(wxBillOtherDeposit.getPayDate()); | |||||
| try { | try { | ||||
| wxBillActionService.save(wxBillAction); | wxBillActionService.save(wxBillAction); | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| @@ -150,8 +150,8 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { | |||||
| wxBillOther.setOwe(record.getReceivePay()-record.getPay()); | wxBillOther.setOwe(record.getReceivePay()-record.getPay()); | ||||
| if (record.getPay().equals(record.getReceivePay())) { | if (record.getPay().equals(record.getReceivePay())) { | ||||
| wxBillOther.setStatus(EnumBillRentStatus.PAID.getCode()); | wxBillOther.setStatus(EnumBillRentStatus.PAID.getCode()); | ||||
| wxBillOther.setPayDate(date); | |||||
| } | } | ||||
| wxBillOther.setPayDate(record.getPayDate()); | |||||
| wxBillOther.setUpdatetime(date); | wxBillOther.setUpdatetime(date); | ||||
| wxBillOther.setPayWay(record.getPayWay()); | wxBillOther.setPayWay(record.getPayWay()); | ||||
| wxBillOther.setComments(record.getComments()); | wxBillOther.setComments(record.getComments()); | ||||
| @@ -173,6 +173,7 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { | |||||
| wxBillAction.setUserName(user.getName()); | wxBillAction.setUserName(user.getName()); | ||||
| wxBillAction.setPhone(user.getPhone()); | wxBillAction.setPhone(user.getPhone()); | ||||
| wxBillAction.setTenantId(wxBillOther.getTenantId()); | wxBillAction.setTenantId(wxBillOther.getTenantId()); | ||||
| wxBillAction.setPayDate(wxBillOther.getPayDate()); | |||||
| try { | try { | ||||
| wxBillActionService.save(wxBillAction); | wxBillActionService.save(wxBillAction); | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| @@ -135,8 +135,8 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe | |||||
| wxBillDeposit.setOwe(record.getReceivePay()-record.getPay()); | wxBillDeposit.setOwe(record.getReceivePay()-record.getPay()); | ||||
| if (record.getPay().equals(record.getReceivePay())) { | if (record.getPay().equals(record.getReceivePay())) { | ||||
| wxBillDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); | wxBillDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); | ||||
| wxBillDeposit.setPayDate(date); | |||||
| } | } | ||||
| wxBillDeposit.setPayDate(record.getPayDate()); | |||||
| wxBillDeposit.setUpdatetime(date); | wxBillDeposit.setUpdatetime(date); | ||||
| wxBillDeposit.setPayWay(record.getPayWay()); | wxBillDeposit.setPayWay(record.getPayWay()); | ||||
| try { | try { | ||||
| @@ -156,6 +156,7 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe | |||||
| wxBillAction.setUserName(user.getName()); | wxBillAction.setUserName(user.getName()); | ||||
| wxBillAction.setPhone(user.getPhone()); | wxBillAction.setPhone(user.getPhone()); | ||||
| wxBillAction.setTenantId(wxBillDeposit.getTenantId()); | wxBillAction.setTenantId(wxBillDeposit.getTenantId()); | ||||
| wxBillAction.setPayDate(wxBillDeposit.getPayDate()); | |||||
| try { | try { | ||||
| wxBillActionService.save(wxBillAction); | wxBillActionService.save(wxBillAction); | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| @@ -138,8 +138,8 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { | |||||
| property.setOwe(record.getReceivePay()-record.getPay()); | property.setOwe(record.getReceivePay()-record.getPay()); | ||||
| if (record.getPay().equals(record.getReceivePay())) { | if (record.getPay().equals(record.getReceivePay())) { | ||||
| property.setStatus(EnumBillRentStatus.PAID.getCode()); | property.setStatus(EnumBillRentStatus.PAID.getCode()); | ||||
| property.setPayDate(date); | |||||
| } | } | ||||
| property.setPayDate(record.getPayDate()); | |||||
| property.setUpdatetime(date); | property.setUpdatetime(date); | ||||
| property.setPayWay(record.getPayWay()); | property.setPayWay(record.getPayWay()); | ||||
| try { | try { | ||||
| @@ -159,6 +159,7 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { | |||||
| wxBillAction.setUserName(user.getName()); | wxBillAction.setUserName(user.getName()); | ||||
| wxBillAction.setPhone(user.getPhone()); | wxBillAction.setPhone(user.getPhone()); | ||||
| wxBillAction.setTenantId(property.getTenantId()); | wxBillAction.setTenantId(property.getTenantId()); | ||||
| wxBillAction.setPayDate(property.getPayDate()); | |||||
| try { | try { | ||||
| wxBillActionService.save(wxBillAction); | wxBillActionService.save(wxBillAction); | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| @@ -137,8 +137,8 @@ public class WxBillRentServiceImpl implements WxBillRentService { | |||||
| wxBillRent.setOwe(record.getReceivePay()-record.getPay()); | wxBillRent.setOwe(record.getReceivePay()-record.getPay()); | ||||
| if (record.getPay().equals(record.getReceivePay())) { | if (record.getPay().equals(record.getReceivePay())) { | ||||
| wxBillRent.setStatus(EnumBillRentStatus.PAID.getCode()); | wxBillRent.setStatus(EnumBillRentStatus.PAID.getCode()); | ||||
| wxBillRent.setPayDate(date); | |||||
| } | } | ||||
| wxBillRent.setPayDate(record.getPayDate()); | |||||
| wxBillRent.setUpdatetime(date); | wxBillRent.setUpdatetime(date); | ||||
| wxBillRent.setPayWay(record.getPayWay()); | wxBillRent.setPayWay(record.getPayWay()); | ||||
| try { | try { | ||||
| @@ -158,6 +158,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { | |||||
| wxBillAction.setUserName(user.getName()); | wxBillAction.setUserName(user.getName()); | ||||
| wxBillAction.setPhone(user.getPhone()); | wxBillAction.setPhone(user.getPhone()); | ||||
| wxBillAction.setTenantId(wxBillRent.getTenantId()); | wxBillAction.setTenantId(wxBillRent.getTenantId()); | ||||
| wxBillAction.setPayDate(wxBillRent.getPayDate()); | |||||
| try { | try { | ||||
| wxBillActionService.save(wxBillAction); | wxBillActionService.save(wxBillAction); | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||