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 e5ced59c1..261654253 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java @@ -456,7 +456,7 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD //租赁账单更新 wxBillDaily.setReceivePay(dto.getNewPrice()); 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()); payDate = new Date(); } 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 261da96fa..d6a7a53ef 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java @@ -432,7 +432,7 @@ public class WxBillDepositServiceImpl extends WxBillBaseService implements WxBil dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,dto.getRemark(), user); }else { 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()); payDate = new Date(); } 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 1a657839f..0099b61c5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java @@ -419,7 +419,7 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements }else { wxBillOtherDeposit.setReceivePay(dto.getNewPrice()); 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()); payDate = new Date(); } 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 ee1ad6bb0..55d9dc56e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java @@ -361,7 +361,7 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO }else { wxBillOther.setReceivePay(dto.getNewPrice()); 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()); payDate = new Date(); } 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 1b49eef87..7dfb65cf9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java @@ -412,7 +412,7 @@ public class WxBillPropertyDepositServiceImpl extends WxBillBaseService implemen }else { wxBillPropertyDeposit.setReceivePay(dto.getNewPrice()); 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()); payDate = new Date(); } 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 ff2f7bba1..724bd9feb 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java @@ -501,7 +501,7 @@ public class WxBillPropertyServiceImpl extends WxBillBaseService implements WxBi } else { Date payDate = null; 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()); payDate = new Date(); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java index 1e5b2335f..f9314d74f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java @@ -430,7 +430,7 @@ public class WxBillRentManageServiceImpl extends WxBillBaseService implements W //租赁账单更新 wxBillRent.setReceivePay(dto.getNewPrice()); 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()); payDate = new Date(); } 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 d6166ae0c..0af6235e2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -595,7 +595,7 @@ public class WxBillRentServiceImpl extends WxBillBaseService implements WxBillRe //租赁账单更新 wxBillRent.setReceivePay(dto.getNewPrice()); 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()); payDate = new Date(); }