| @@ -180,58 +180,58 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| @Override | @Override | ||||
| public void updateBill(Map<String, Object> bill) { | public void updateBill(Map<String, Object> bill) { | ||||
| int billTypeValue = ((Long) bill.get("billTypeValue")).intValue(); | int billTypeValue = ((Long) bill.get("billTypeValue")).intValue(); | ||||
| logger.info(">>>>>>>>>>>>>>>>>>>>账单回调修改数据:" + JSONObject.toJSONString(bill)); | |||||
| if (billTypeValue==EnumBillTypeParam.RENT.getCode().intValue()) { | if (billTypeValue==EnumBillTypeParam.RENT.getCode().intValue()) { | ||||
| //更新租金账单 | |||||
| logger.info("更新租金账单"); | |||||
| WxBillRent billRent = wxBillRentMapper.selectByPrimaryKey(bill.get("id")); | WxBillRent billRent = wxBillRentMapper.selectByPrimaryKey(bill.get("id")); | ||||
| if(billRent!=null && !billRent.getStatus().equals(EnumBillRentStatus.PAID.getCode())){ | if(billRent!=null && !billRent.getStatus().equals(EnumBillRentStatus.PAID.getCode())){ | ||||
| updateBillRent(bill); | updateBillRent(bill); | ||||
| } | } | ||||
| } else if (billTypeValue==EnumBillTypeParam.RENT_DEPOSIT.getCode().intValue()) { | } else if (billTypeValue==EnumBillTypeParam.RENT_DEPOSIT.getCode().intValue()) { | ||||
| //更新租金押金账单 | |||||
| logger.info("更新租金押金账单"); | |||||
| WxBillDeposit billDeposit = wxBillDepositMapper.selectByPrimaryKey(bill.get("id")); | WxBillDeposit billDeposit = wxBillDepositMapper.selectByPrimaryKey(bill.get("id")); | ||||
| if(billDeposit!=null && !billDeposit.getStatus().equals(EnumBillRentStatus.PAID.getCode())){ | if(billDeposit!=null && !billDeposit.getStatus().equals(EnumBillRentStatus.PAID.getCode())){ | ||||
| updateBillRentDeposit(bill); | updateBillRentDeposit(bill); | ||||
| } | } | ||||
| } else if (billTypeValue==EnumBillTypeParam.PROPERTY.getCode().intValue()) { | } else if (billTypeValue==EnumBillTypeParam.PROPERTY.getCode().intValue()) { | ||||
| //更新物业账单 | |||||
| logger.info("更新物业账单"); | |||||
| WxBillProperty property = wxBillPropertyMapper.selectByPrimaryKey(bill.get("id")); | WxBillProperty property = wxBillPropertyMapper.selectByPrimaryKey(bill.get("id")); | ||||
| if(property!=null && !property.getStatus().equals(EnumBillRentStatus.PAID.getCode())){ | if(property!=null && !property.getStatus().equals(EnumBillRentStatus.PAID.getCode())){ | ||||
| updateBillProperty(bill); | updateBillProperty(bill); | ||||
| } | } | ||||
| } else if (billTypeValue==EnumBillTypeParam.PROPERTY_DEPOSIT.getCode().intValue()) { | } else if (billTypeValue==EnumBillTypeParam.PROPERTY_DEPOSIT.getCode().intValue()) { | ||||
| //更新物业押金账单 | |||||
| logger.info("更新物业押金账单"); | |||||
| WxBillPropertyDeposit wxBillPropertyDeposit = wxBillPropertyDepositMapper.selectByPrimaryKey(bill.get("id")); | WxBillPropertyDeposit wxBillPropertyDeposit = wxBillPropertyDepositMapper.selectByPrimaryKey(bill.get("id")); | ||||
| if(wxBillPropertyDeposit!=null && !wxBillPropertyDeposit.getStatus().equals(EnumBillRentStatus.PAID.getCode())){ | if(wxBillPropertyDeposit!=null && !wxBillPropertyDeposit.getStatus().equals(EnumBillRentStatus.PAID.getCode())){ | ||||
| updateBillPropertyDeposit(bill); | updateBillPropertyDeposit(bill); | ||||
| } | } | ||||
| } else if (billTypeValue==EnumBillTypeParam.WATER.getCode().intValue()) { | } else if (billTypeValue==EnumBillTypeParam.WATER.getCode().intValue()) { | ||||
| //更新水费账单 | |||||
| logger.info("更新水费账单"); | |||||
| WxBillDaily wxBillDaily = wxBillDailyMapper.selectByPrimaryKey(bill.get("id")); | WxBillDaily wxBillDaily = wxBillDailyMapper.selectByPrimaryKey(bill.get("id")); | ||||
| if(wxBillDaily!=null && !wxBillDaily.getStatus().equals(EnumBillRentStatus.PAID.getCode())){ | if(wxBillDaily!=null && !wxBillDaily.getStatus().equals(EnumBillRentStatus.PAID.getCode())){ | ||||
| updateBillDaily(bill); | updateBillDaily(bill); | ||||
| } | } | ||||
| } else if (billTypeValue==EnumBillTypeParam.POWER.getCode().intValue()) { | } else if (billTypeValue==EnumBillTypeParam.POWER.getCode().intValue()) { | ||||
| //更新电费账单 | |||||
| logger.info("更新电费账单"); | |||||
| WxBillDaily wxBillDaily = wxBillDailyMapper.selectByPrimaryKey(bill.get("id")); | WxBillDaily wxBillDaily = wxBillDailyMapper.selectByPrimaryKey(bill.get("id")); | ||||
| if(wxBillDaily!=null && !wxBillDaily.getStatus().equals(EnumBillRentStatus.PAID.getCode())){ | if(wxBillDaily!=null && !wxBillDaily.getStatus().equals(EnumBillRentStatus.PAID.getCode())){ | ||||
| updateBillDaily(bill); | updateBillDaily(bill); | ||||
| } | } | ||||
| } else if (billTypeValue == EnumBillTypeParam.AIR_CONDITIONING.getCode().intValue()) { | } else if (billTypeValue == EnumBillTypeParam.AIR_CONDITIONING.getCode().intValue()) { | ||||
| //更新空调费账单 | |||||
| logger.info("更新空调费账单"); | |||||
| WxBillDaily wxBillDaily = wxBillDailyMapper.selectByPrimaryKey(bill.get("id")); | WxBillDaily wxBillDaily = wxBillDailyMapper.selectByPrimaryKey(bill.get("id")); | ||||
| if (wxBillDaily != null && !wxBillDaily.getStatus().equals(EnumBillRentStatus.PAID.getCode())) { | if (wxBillDaily != null && !wxBillDaily.getStatus().equals(EnumBillRentStatus.PAID.getCode())) { | ||||
| updateBillDaily(bill); | updateBillDaily(bill); | ||||
| } | } | ||||
| } else if (billTypeValue==EnumBillTypeParam.ROUTINE.getCode().intValue()) { | } else if (billTypeValue==EnumBillTypeParam.ROUTINE.getCode().intValue()) { | ||||
| //更新其他账单 | |||||
| logger.info("更新其他账单"); | |||||
| WxBillOther wxBillOther = wxBillOtherMapper.selectByPrimaryKey(bill.get("id")); | WxBillOther wxBillOther = wxBillOtherMapper.selectByPrimaryKey(bill.get("id")); | ||||
| if(wxBillOther!=null && !wxBillOther.getStatus().equals(EnumBillRentStatus.PAID.getCode())){ | if(wxBillOther!=null && !wxBillOther.getStatus().equals(EnumBillRentStatus.PAID.getCode())){ | ||||
| updateBillOther(bill); | updateBillOther(bill); | ||||
| } | } | ||||
| } else if (billTypeValue == EnumBillTypeParam.ATHER_DEPOSIT.getCode().intValue()) { | } else if (billTypeValue == EnumBillTypeParam.ATHER_DEPOSIT.getCode().intValue()) { | ||||
| //更新其他押金账单 | |||||
| logger.info("更新其他押金账单"); | |||||
| WxBillOtherDeposit wxBillOtherDeposit = wxBillOtherDepositMapper.selectByPrimaryKey(bill.get("id")); | WxBillOtherDeposit wxBillOtherDeposit = wxBillOtherDepositMapper.selectByPrimaryKey(bill.get("id")); | ||||
| if (wxBillOtherDeposit != null && !wxBillOtherDeposit.getStatus().equals(EnumBillRentStatus.PAID.getCode())) { | if (wxBillOtherDeposit != null && !wxBillOtherDeposit.getStatus().equals(EnumBillRentStatus.PAID.getCode())) { | ||||
| updateBillOtherDeposit(bill); | updateBillOtherDeposit(bill); | ||||