| @@ -968,7 +968,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| } | } | ||||
| rentQuery.setIsPreview(EnumIsPreview.NO.getCode()); | rentQuery.setIsPreview(EnumIsPreview.NO.getCode()); | ||||
| WxBillRent rent = wxBillRentMapper.selectOne(rentQuery); | WxBillRent rent = wxBillRentMapper.selectOne(rentQuery); | ||||
| if (rent != null) { | |||||
| if (rent != null && !rent.getStatus().equals(EnumBillRentStatus.PAID.getCode())) { | |||||
| long pay = new BigDecimal(bill.getPayStr()).multiply(new BigDecimal(100)).longValueExact(); | long pay = new BigDecimal(bill.getPayStr()).multiply(new BigDecimal(100)).longValueExact(); | ||||
| if (rent.getOwe() <= pay) { | if (rent.getOwe() <= pay) { | ||||
| rent.setStatus(EnumBillRentStatus.PAID.getCode()); | rent.setStatus(EnumBillRentStatus.PAID.getCode()); | ||||
| @@ -993,7 +993,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| } | } | ||||
| propertyQuery.setIsPreview(EnumIsPreview.NO.getCode()); | propertyQuery.setIsPreview(EnumIsPreview.NO.getCode()); | ||||
| WxBillProperty property = wxBillPropertyMapper.selectOne(propertyQuery); | WxBillProperty property = wxBillPropertyMapper.selectOne(propertyQuery); | ||||
| if (property != null) { | |||||
| if (property != null && !property.getStatus().equals(EnumBillRentStatus.PAID.getCode())) { | |||||
| long pay = new BigDecimal(bill.getPayStr()).multiply(new BigDecimal(100)).longValueExact(); | long pay = new BigDecimal(bill.getPayStr()).multiply(new BigDecimal(100)).longValueExact(); | ||||
| if (property.getOwe() <= pay) { | if (property.getOwe() <= pay) { | ||||
| property.setStatus(EnumBillRentStatus.PAID.getCode()); | property.setStatus(EnumBillRentStatus.PAID.getCode()); | ||||
| @@ -1023,7 +1023,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| dailyQuery.setIsDel(EnumDelStatus.NOT_DEL.getCode()); | dailyQuery.setIsDel(EnumDelStatus.NOT_DEL.getCode()); | ||||
| WxBillDaily daily = wxBillDailyMapper.selectOne(dailyQuery); | WxBillDaily daily = wxBillDailyMapper.selectOne(dailyQuery); | ||||
| long pay = new BigDecimal(bill.getPayStr()).multiply(new BigDecimal(100)).longValueExact(); | long pay = new BigDecimal(bill.getPayStr()).multiply(new BigDecimal(100)).longValueExact(); | ||||
| if (daily != null) { | |||||
| if (daily != null && !daily.getStatus().equals(EnumBillRentStatus.PAID.getCode())) { | |||||
| if (daily.getOwe() <= pay) { | if (daily.getOwe() <= pay) { | ||||
| daily.setStatus(EnumBillRentStatus.PAID.getCode()); | daily.setStatus(EnumBillRentStatus.PAID.getCode()); | ||||
| } | } | ||||
| @@ -1070,7 +1070,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| otherQuery.setIsDel(EnumDelStatus.NOT_DEL.getCode()); | otherQuery.setIsDel(EnumDelStatus.NOT_DEL.getCode()); | ||||
| WxBillOther other = wxBillOtherMapper.selectOne(otherQuery); | WxBillOther other = wxBillOtherMapper.selectOne(otherQuery); | ||||
| long pay = new BigDecimal(bill.getPayStr()).multiply(new BigDecimal(100)).longValueExact(); | long pay = new BigDecimal(bill.getPayStr()).multiply(new BigDecimal(100)).longValueExact(); | ||||
| if (other != null) { | |||||
| if (other != null && !other.getStatus().equals(EnumBillRentStatus.PAID.getCode())) { | |||||
| if (other.getOwe() <= pay) { | if (other.getOwe() <= pay) { | ||||
| other.setStatus(EnumBillRentStatus.PAID.getCode()); | other.setStatus(EnumBillRentStatus.PAID.getCode()); | ||||
| } | } | ||||
| @@ -1118,7 +1118,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| otherDepositQuery.setIsDel(EnumDelStatus.NOT_DEL.getCode()); | otherDepositQuery.setIsDel(EnumDelStatus.NOT_DEL.getCode()); | ||||
| WxBillOtherDeposit otherDeposit = wxBillOtherDepositMapper.selectOne(otherDepositQuery); | WxBillOtherDeposit otherDeposit = wxBillOtherDepositMapper.selectOne(otherDepositQuery); | ||||
| long pay = new BigDecimal(bill.getPayStr()).multiply(new BigDecimal(100)).longValueExact(); | long pay = new BigDecimal(bill.getPayStr()).multiply(new BigDecimal(100)).longValueExact(); | ||||
| if (otherDeposit != null) { | |||||
| if (otherDeposit != null && !otherDeposit.getStatus().equals(EnumBillRentStatus.PAID.getCode())) { | |||||
| if (otherDeposit.getOwe() <= pay) { | if (otherDeposit.getOwe() <= pay) { | ||||
| otherDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); | otherDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); | ||||
| } | } | ||||