diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java index 85418a705..59a49ed98 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java @@ -159,8 +159,8 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { wxBillDaily.setOwe(record.getReceivePay()-record.getPay()); if (record.getPay().equals(record.getReceivePay())) { wxBillDaily.setStatus(EnumBillRentStatus.PAID.getCode()); - wxBillDaily.setPayDate(date); } + wxBillDaily.setPayDate(record.getPayDate()); wxBillDaily.setUpdatetime(date); wxBillDaily.setPayWay(record.getPayWay()); try { @@ -180,6 +180,7 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { wxBillAction.setUserName(user.getName()); wxBillAction.setPhone(user.getPhone()); wxBillAction.setTenantId(wxBillDaily.getTenantId()); + wxBillAction.setPayDate(wxBillDaily.getPayDate()); try { wxBillActionService.save(wxBillAction); } catch (Exception e) { 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 496cab032..36d873166 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java @@ -135,8 +135,8 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { wxBillDeposit.setOwe(record.getReceivePay()-record.getPay()); if (record.getPay().equals(record.getReceivePay())) { wxBillDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); - wxBillDeposit.setPayDate(date); } + wxBillDeposit.setPayDate(record.getPayDate()); wxBillDeposit.setUpdatetime(date); wxBillDeposit.setUpdatetime(new Date()); wxBillDeposit.setPayWay(record.getPayWay()); @@ -157,6 +157,7 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { wxBillAction.setUserName(user.getName()); wxBillAction.setPhone(user.getPhone()); wxBillAction.setTenantId(wxBillDeposit.getTenantId()); + wxBillAction.setPayDate(wxBillDeposit.getPayDate()); try { wxBillActionService.save(wxBillAction); } catch (Exception e) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java index 00eba0e86..079d54ee2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java @@ -151,8 +151,8 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService wxBillOtherDeposit.setOwe(record.getReceivePay() - record.getPay()); if (record.getPay().equals(record.getReceivePay())) { wxBillOtherDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); - wxBillOtherDeposit.setPayDate(date); } + wxBillOtherDeposit.setPayDate(record.getPayDate()); wxBillOtherDeposit.setUpdatetime(date); wxBillOtherDeposit.setPayWay(record.getPayWay()); wxBillOtherDeposit.setComments(record.getComments()); @@ -173,6 +173,7 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService wxBillAction.setUserName(user.getName()); wxBillAction.setPhone(user.getPhone()); wxBillAction.setTenantId(wxBillOtherDeposit.getTenantId()); + wxBillAction.setPayDate(wxBillOtherDeposit.getPayDate()); try { wxBillActionService.save(wxBillAction); } catch (Exception e) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java index a2e633404..e98e91f80 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java @@ -150,8 +150,8 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { wxBillOther.setOwe(record.getReceivePay()-record.getPay()); if (record.getPay().equals(record.getReceivePay())) { wxBillOther.setStatus(EnumBillRentStatus.PAID.getCode()); - wxBillOther.setPayDate(date); } + wxBillOther.setPayDate(record.getPayDate()); wxBillOther.setUpdatetime(date); wxBillOther.setPayWay(record.getPayWay()); wxBillOther.setComments(record.getComments()); @@ -173,6 +173,7 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { wxBillAction.setUserName(user.getName()); wxBillAction.setPhone(user.getPhone()); wxBillAction.setTenantId(wxBillOther.getTenantId()); + wxBillAction.setPayDate(wxBillOther.getPayDate()); try { wxBillActionService.save(wxBillAction); } catch (Exception e) { 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 3e18ccb29..52cad67d8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java @@ -135,8 +135,8 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe wxBillDeposit.setOwe(record.getReceivePay()-record.getPay()); if (record.getPay().equals(record.getReceivePay())) { wxBillDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); - wxBillDeposit.setPayDate(date); } + wxBillDeposit.setPayDate(record.getPayDate()); wxBillDeposit.setUpdatetime(date); wxBillDeposit.setPayWay(record.getPayWay()); try { @@ -156,6 +156,7 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe wxBillAction.setUserName(user.getName()); wxBillAction.setPhone(user.getPhone()); wxBillAction.setTenantId(wxBillDeposit.getTenantId()); + wxBillAction.setPayDate(wxBillDeposit.getPayDate()); try { wxBillActionService.save(wxBillAction); } 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 49cdfdd1c..48e3cfba9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java @@ -138,8 +138,8 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { property.setOwe(record.getReceivePay()-record.getPay()); if (record.getPay().equals(record.getReceivePay())) { property.setStatus(EnumBillRentStatus.PAID.getCode()); - property.setPayDate(date); } + property.setPayDate(record.getPayDate()); property.setUpdatetime(date); property.setPayWay(record.getPayWay()); try { @@ -159,6 +159,7 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { wxBillAction.setUserName(user.getName()); wxBillAction.setPhone(user.getPhone()); wxBillAction.setTenantId(property.getTenantId()); + wxBillAction.setPayDate(property.getPayDate()); try { wxBillActionService.save(wxBillAction); } catch (Exception e) { 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 829cc17e8..ed98b2fc9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -137,8 +137,8 @@ public class WxBillRentServiceImpl implements WxBillRentService { wxBillRent.setOwe(record.getReceivePay()-record.getPay()); if (record.getPay().equals(record.getReceivePay())) { wxBillRent.setStatus(EnumBillRentStatus.PAID.getCode()); - wxBillRent.setPayDate(date); } + wxBillRent.setPayDate(record.getPayDate()); wxBillRent.setUpdatetime(date); wxBillRent.setPayWay(record.getPayWay()); try { @@ -158,6 +158,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { wxBillAction.setUserName(user.getName()); wxBillAction.setPhone(user.getPhone()); wxBillAction.setTenantId(wxBillRent.getTenantId()); + wxBillAction.setPayDate(wxBillRent.getPayDate()); try { wxBillActionService.save(wxBillAction); } catch (Exception e) {