| @@ -961,18 +961,18 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| //如果账单存在缴费,付款,减免,冲抵,等情况,则不允许。 | //如果账单存在缴费,付款,减免,冲抵,等情况,则不允许。 | ||||
| WxAllBill bq = wxBillAllHelper.generateRentContractQueryBill(rentcontract, rentcontract.getId(),startime,endtime); | WxAllBill bq = wxBillAllHelper.generateRentContractQueryBill(rentcontract, rentcontract.getId(),startime,endtime); | ||||
| List<WxAllBill> rentBillList = wxAllBillMapper.findList(bq); | List<WxAllBill> rentBillList = wxAllBillMapper.findList(bq); | ||||
| if (null == rentBillList || rentBillList.size() <= 0 ) { | |||||
| throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"未查询到账单"); | |||||
| } | |||||
| for (int i = 0 ; i < rentBillList.size() ; i ++) { | |||||
| WxAllBill rentBill = rentBillList.get(i); | |||||
| if ((StringUtils.isNotBlank(rentBill.getPay()) && new BigDecimal(rentBill.getPay()).compareTo(new BigDecimal(0)) > 0 ) | |||||
| || (StringUtils.isNotBlank(rentBill.getSetOff()) && new BigDecimal(rentBill.getSetOff()).compareTo(new BigDecimal(0)) > 0 ) | |||||
| || (StringUtils.isNotBlank(rentBill.getReturnPay()) && new BigDecimal(rentBill.getReturnPay()).compareTo(new BigDecimal(0)) > 0 ) | |||||
| || (StringUtils.isNotBlank(rentBill.getUseMoney()) && new BigDecimal(rentBill.getUseMoney()).compareTo(new BigDecimal(0)) > 0 ) ) { | |||||
| throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"租金账单存在已经已经缴费或付款,扣减,减免,冲抵的情况,不允许操作"); | |||||
| } | |||||
| if (null != rentBillList && rentBillList.size() > 0 ) { | |||||
| for (int i = 0 ; i < rentBillList.size() ; i ++) { | |||||
| WxAllBill rentBill = rentBillList.get(i); | |||||
| if ((StringUtils.isNotBlank(rentBill.getPay()) && new BigDecimal(rentBill.getPay()).compareTo(new BigDecimal(0)) > 0 ) | |||||
| || (StringUtils.isNotBlank(rentBill.getSetOff()) && new BigDecimal(rentBill.getSetOff()).compareTo(new BigDecimal(0)) > 0 ) | |||||
| || (StringUtils.isNotBlank(rentBill.getReturnPay()) && new BigDecimal(rentBill.getReturnPay()).compareTo(new BigDecimal(0)) > 0 ) | |||||
| || (StringUtils.isNotBlank(rentBill.getUseMoney()) && new BigDecimal(rentBill.getUseMoney()).compareTo(new BigDecimal(0)) > 0 ) ) { | |||||
| throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"租金账单存在已经已经缴费或付款,扣减,减免,冲抵的情况,不允许操作"); | |||||
| } | |||||
| } | |||||
| } | } | ||||
| //删除自动创建的账单 | //删除自动创建的账单 | ||||
| WxAllBill billDel = new WxAllBill(); | WxAllBill billDel = new WxAllBill(); | ||||