| @@ -456,7 +456,7 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD | |||||
| //租赁账单更新 | //租赁账单更新 | ||||
| wxBillDaily.setReceivePay(dto.getNewPrice()); | wxBillDaily.setReceivePay(dto.getNewPrice()); | ||||
| Date payDate = null; | Date payDate = null; | ||||
| if (new BigDecimal(dto.getNewPrice()).compareTo(new BigDecimal(dbBill.getPay())) >= 0) { | |||||
| if (new BigDecimal(dto.getNewPrice()).compareTo(new BigDecimal(dbBill.getPay())) <= 0) { | |||||
| wxBillDaily.setStatus(EnumBillStatus.PAID.getCode()); | wxBillDaily.setStatus(EnumBillStatus.PAID.getCode()); | ||||
| payDate = new Date(); | payDate = new Date(); | ||||
| } | } | ||||
| @@ -432,7 +432,7 @@ public class WxBillDepositServiceImpl extends WxBillBaseService implements WxBil | |||||
| dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,dto.getRemark(), user); | dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,dto.getRemark(), user); | ||||
| }else { | }else { | ||||
| wxBillDeposit.setReceivePay(dto.getNewPrice()); | wxBillDeposit.setReceivePay(dto.getNewPrice()); | ||||
| if (new BigDecimal(dto.getNewPrice()).compareTo(new BigDecimal(dbBill.getPay())) >= 0) { | |||||
| if (new BigDecimal(dto.getNewPrice()).compareTo(new BigDecimal(dbBill.getPay())) <= 0) { | |||||
| wxBillDeposit.setStatus(EnumBillStatus.PAID.getCode()); | wxBillDeposit.setStatus(EnumBillStatus.PAID.getCode()); | ||||
| payDate = new Date(); | payDate = new Date(); | ||||
| } | } | ||||
| @@ -419,7 +419,7 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements | |||||
| }else { | }else { | ||||
| wxBillOtherDeposit.setReceivePay(dto.getNewPrice()); | wxBillOtherDeposit.setReceivePay(dto.getNewPrice()); | ||||
| Date payDate = null; | Date payDate = null; | ||||
| if (new BigDecimal(dto.getNewPrice()).compareTo(new BigDecimal(dbBill.getPay())) >= 0) { | |||||
| if (new BigDecimal(dto.getNewPrice()).compareTo(new BigDecimal(dbBill.getPay())) <= 0) { | |||||
| wxBillOtherDeposit.setStatus(EnumBillStatus.PAID.getCode()); | wxBillOtherDeposit.setStatus(EnumBillStatus.PAID.getCode()); | ||||
| payDate = new Date(); | payDate = new Date(); | ||||
| } | } | ||||
| @@ -361,7 +361,7 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO | |||||
| }else { | }else { | ||||
| wxBillOther.setReceivePay(dto.getNewPrice()); | wxBillOther.setReceivePay(dto.getNewPrice()); | ||||
| Date payDate = null; | Date payDate = null; | ||||
| if (new BigDecimal(dto.getNewPrice()).compareTo(new BigDecimal(dbBill.getPay())) >= 0) { | |||||
| if (new BigDecimal(dto.getNewPrice()).compareTo(new BigDecimal(dbBill.getPay())) <= 0) { | |||||
| wxBillOther.setStatus(EnumBillStatus.PAID.getCode()); | wxBillOther.setStatus(EnumBillStatus.PAID.getCode()); | ||||
| payDate = new Date(); | payDate = new Date(); | ||||
| } | } | ||||
| @@ -412,7 +412,7 @@ public class WxBillPropertyDepositServiceImpl extends WxBillBaseService implemen | |||||
| }else { | }else { | ||||
| wxBillPropertyDeposit.setReceivePay(dto.getNewPrice()); | wxBillPropertyDeposit.setReceivePay(dto.getNewPrice()); | ||||
| Date payDate = null; | Date payDate = null; | ||||
| if (new BigDecimal(dto.getNewPrice()).compareTo(new BigDecimal(dbBill.getPay())) >= 0) { | |||||
| if (new BigDecimal(dto.getNewPrice()).compareTo(new BigDecimal(dbBill.getPay())) <= 0) { | |||||
| wxBillPropertyDeposit.setStatus(EnumBillStatus.PAID.getCode()); | wxBillPropertyDeposit.setStatus(EnumBillStatus.PAID.getCode()); | ||||
| payDate = new Date(); | payDate = new Date(); | ||||
| } | } | ||||
| @@ -501,7 +501,7 @@ public class WxBillPropertyServiceImpl extends WxBillBaseService implements WxBi | |||||
| } else { | } else { | ||||
| Date payDate = null; | Date payDate = null; | ||||
| wxBillProperty.setReceivePay(dto.getNewPrice()); | wxBillProperty.setReceivePay(dto.getNewPrice()); | ||||
| if (new BigDecimal(dto.getNewPrice()).compareTo(new BigDecimal(dbBill.getPay())) >= 0) { | |||||
| if (new BigDecimal(dto.getNewPrice()).compareTo(new BigDecimal(dbBill.getPay())) <= 0) { | |||||
| wxBillProperty.setStatus(EnumBillStatus.PAID.getCode()); | wxBillProperty.setStatus(EnumBillStatus.PAID.getCode()); | ||||
| payDate = new Date(); | payDate = new Date(); | ||||
| } | } | ||||
| @@ -430,7 +430,7 @@ public class WxBillRentManageServiceImpl extends WxBillBaseService implements W | |||||
| //租赁账单更新 | //租赁账单更新 | ||||
| wxBillRent.setReceivePay(dto.getNewPrice()); | wxBillRent.setReceivePay(dto.getNewPrice()); | ||||
| Date payDate = null; | Date payDate = null; | ||||
| if (new BigDecimal(dto.getNewPrice()).compareTo(new BigDecimal(dbBill.getPay())) >= 0) { | |||||
| if (new BigDecimal(dto.getNewPrice()).compareTo(new BigDecimal(dbBill.getPay())) <= 0) { | |||||
| wxBillRent.setStatus(EnumBillStatus.PAID.getCode()); | wxBillRent.setStatus(EnumBillStatus.PAID.getCode()); | ||||
| payDate = new Date(); | payDate = new Date(); | ||||
| } | } | ||||
| @@ -595,7 +595,7 @@ public class WxBillRentServiceImpl extends WxBillBaseService implements WxBillRe | |||||
| //租赁账单更新 | //租赁账单更新 | ||||
| wxBillRent.setReceivePay(dto.getNewPrice()); | wxBillRent.setReceivePay(dto.getNewPrice()); | ||||
| Date payDate = null; | Date payDate = null; | ||||
| if (new BigDecimal(dto.getNewPrice()).compareTo(new BigDecimal(dbBill.getPay())) >= 0) { | |||||
| if (new BigDecimal(dto.getNewPrice()).compareTo(new BigDecimal(dbBill.getPay())) <= 0) { | |||||
| wxBillRent.setStatus(EnumBillStatus.PAID.getCode()); | wxBillRent.setStatus(EnumBillStatus.PAID.getCode()); | ||||
| payDate = new Date(); | payDate = new Date(); | ||||
| } | } | ||||