From 21aba3e864275af15e523192a4709d0a318ccdaa Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 23 May 2019 14:44:52 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=B4=A6=E5=8D=95][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=90=84=E8=B4=A6=E5=8D=95=E7=BB=93=E5=8D=95=E6=97=B6=E9=97=B4?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/WxBillAllServiceImpl.java | 7 +++++++ .../iformall/service/impl/WxBillDailyServiceImpl.java | 10 ++++++---- .../service/impl/WxBillDepositServiceImpl.java | 8 ++++++-- .../service/impl/WxBillOtherDepositServiceImpl.java | 9 ++++++--- .../iformall/service/impl/WxBillOtherServiceImpl.java | 9 ++++++--- .../service/impl/WxBillPropertyDepositServiceImpl.java | 9 ++++++--- .../service/impl/WxBillPropertyServiceImpl.java | 9 ++++++--- .../iformall/service/impl/WxBillRentServiceImpl.java | 10 ++++++---- 8 files changed, 49 insertions(+), 22 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index 1d9e2028b..7c2e29b24 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -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()); 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 64e3c6a6f..b7e00530c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java @@ -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); 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 3d75b894d..3dd37dcf8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java @@ -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 { 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 65968ccfa..7c52f72a4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java @@ -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 { 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 2ba652f42..a2e633404 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java @@ -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()); 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 43383c7ab..b3dd0c211 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java @@ -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); 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 17e150daa..1bf4e2e13 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java @@ -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); 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 5bf365bd2..ee52bdbd8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -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);