java/xizang.git

			@@ -294,7 +294,7 @@
			}
			if (tContractRentType != null && rentBill.getEndTime().isAfter(tContractRentType.getChangeTime())) {
			long moneyDays = 0;
			moneyDays = ChronoUnit.DAYS.between(tContractRentType.getChangeTime(), rentBill.getEndTime());
			moneyDays = ChronoUnit.DAYS.between(tContractRentType.getChangeTime(), rentBill.getEndTime())+1;
			// 计算租金变动的天数
			contract.setChangeTime(tContractRentType.getChangeTime());
			// 递增递减的租金
			@@ -330,14 +330,14 @@
			break;
			}
			// 不需要涨租金的时间段
			long originalDays = Math.abs(ChronoUnit.DAYS.between(contract.getFirstPayTime(), tContractRentType.getChangeTime()));
			long originalDays = Math.abs(ChronoUnit.DAYS.between(contract.getFirstPayTime(), tContractRentType.getChangeTime()))+1;
			originalMoney = originalMoney.add(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN))
			.multiply(new BigDecimal(originalDays));
			rentBill.setPayableFeesMoney(contractRentTypeMoney.add(originalMoney));
			rentBill.setOutstandingMoney(rentBill.getPayableFeesMoney());
			} else {
			// 不走递增递减
			long allDays = ChronoUnit.DAYS.between(contract.getStartPayTime(), rentBill.getEndTime());
			long allDays = ChronoUnit.DAYS.between(contract.getStartPayTime(), rentBill.getEndTime())+1;
			int dayOfMonth = rentBill.getStartTime().getDayOfMonth();
			if (dayOfMonth == 1) {
			rentBill.setPayableFeesMoney(contract.getMonthRent().multiply(new BigDecimal(contract.getPayType().equals("1") ? 1 : contract.getPayType().equals("2") ? 3 : 12)));
			@@ -394,7 +394,7 @@
			if (changeTime.isBefore(tBill.getEndTime()) && changeTime.isAfter(tBill.getStartTime())) {
			contract.setChangeTime(changeTime);
			// 租金递增递减的时长天
			long moneyDays = Math.abs(ChronoUnit.DAYS.between(tContractRentType.getChangeTime(), beforeBill.getEndTime()));
			long moneyDays = Math.abs(ChronoUnit.DAYS.between(tContractRentType.getChangeTime(), tBill.getEndTime()))+1;
			// 递增递减的租金
			BigDecimal contractRentTypeMoney = new BigDecimal("0");
			// 不递增递减的租金
			@@ -443,10 +443,12 @@
			}
			}else{
			if (tContractRentType.getChangeTime().isBefore(tBill.getEndTime()) && tContractRentType.getChangeTime().isAfter(tBill.getStartTime())) {
			System.err.println("首次递增递减");
			contract.setChangeTime(tContractRentType.getChangeTime());
			// 租金递增递减的时长天
			long moneyDays = Math.abs(ChronoUnit.DAYS.between(tContractRentType.getChangeTime(), beforeBill.getEndTime()));
			long moneyDays = Math.abs(ChronoUnit.DAYS.between(tContractRentType.getChangeTime(), tBill.getEndTime()))+1;
			// 递增递减的租金

			BigDecimal contractRentTypeMoney = new BigDecimal("0");
			// 不递增递减的租金
			BigDecimal originalMoney = new BigDecimal("0");
			@@ -487,7 +489,9 @@
			tBill.setPayableFeesMoney(contractRentTypeMoney.add(originalMoney));
			tBill.setOutstandingMoney(tBill.getPayableFeesMoney());
			contractService.updateById(contract);

			}else{
			tBill.setPayableFeesMoney(contract.getChangeRent().multiply(new BigDecimal(contract.getPayType().equals("1") ? 1 : contract.getPayType().equals("2") ? 3 : 12)));
			tBill.setOutstandingMoney(tBill.getPayableFeesMoney());
			}
			}
			} else {
			@@ -522,6 +526,7 @@
			tBill.setBillType("1");
			tBill.setStartTime(beforeBill.getEndTime().plusDays(1));
			tBill.setEndTime(contract.getEndTime());
			tBill.setContractNumber(contract.getContractNumber());
			if (contract.getIsIncreasing()) {
			if (tContractRentType != null) {
			// 如果变过并且时间在递增递减时间段内
			@@ -532,7 +537,7 @@
			if (changeTime.isBefore(tBill.getEndTime()) && changeTime.isAfter(tBill.getStartTime())) {
			contract.setChangeTime(changeTime);
			// 租金递增递减的时长天
			long moneyDays = Math.abs(ChronoUnit.DAYS.between(tContractRentType.getChangeTime(), beforeBill.getEndTime()));
			long moneyDays = Math.abs(ChronoUnit.DAYS.between(changeTime, tBill.getEndTime()))+1;
			// 递增递减的租金
			BigDecimal contractRentTypeMoney = new BigDecimal("0");
			// 不递增递减的租金
			@@ -566,7 +571,7 @@
			break;
			}
			// 不需要涨租金的时间段
			long originalDays = ChronoUnit.DAYS.between(beforeBill.getEndTime(), tContractRentType.getChangeTime());
			long originalDays = ChronoUnit.DAYS.between(beforeBill.getEndTime(), changeTime);
			if (originalDays > 0) {
			originalMoney = originalMoney.add(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN))
			.multiply(new BigDecimal(originalDays));
			@@ -575,15 +580,15 @@
			tBill.setOutstandingMoney(tBill.getPayableFeesMoney());
			contractService.updateById(contract);
			} else {
			// 不涨租金用上次的
			tBill.setPayableFeesMoney(contract.getChangeRent().multiply(new BigDecimal(contract.getPayType().equals("1")?1:contract.getPayType().equals("2")?3:12)));
			long finalDays = ChronoUnit.DAYS.between(beforeBill.getEndTime(), contract.getEndTime());
			tBill.setPayableFeesMoney(contract.getChangeRent().divide(new BigDecimal("30"),2,BigDecimal.ROUND_DOWN).multiply(new BigDecimal(finalDays)));
			tBill.setOutstandingMoney(tBill.getPayableFeesMoney());
			}
			}else{
			if (tContractRentType.getChangeTime().isBefore(tBill.getEndTime()) && tContractRentType.getChangeTime().isAfter(tBill.getStartTime())) {
			contract.setChangeTime(tContractRentType.getChangeTime());
			// 租金递增递减的时长天
			long moneyDays = Math.abs(ChronoUnit.DAYS.between(tContractRentType.getChangeTime(), beforeBill.getEndTime()));
			long moneyDays = Math.abs(ChronoUnit.DAYS.between(tContractRentType.getChangeTime(), tBill.getEndTime()))+1;
			// 递增递减的租金
			BigDecimal contractRentTypeMoney = new BigDecimal("0");
			// 不递增递减的租金
			@@ -643,7 +648,6 @@
			long finalDays = ChronoUnit.DAYS.between(beforeBill.getEndTime(), contract.getEndTime());
			tBill.setPayableFeesMoney(contract.getChangeRent().divide(new BigDecimal("30"),2,BigDecimal.ROUND_DOWN).multiply(new BigDecimal(finalDays)));
			tBill.setOutstandingMoney(tBill.getPayableFeesMoney());
			tBill.setContractNumber(contract.getContractNumber());
			}
			if (tBill.getEndTime().getDayOfMonth()>=15){
			tBill.setPayableFeesTime(tBill.getStartTime().withDayOfMonth(15).toLocalDate());