java/xizang.git

			@@ -369,8 +369,11 @@
			.last("limit 1").one();
			if (!beforeBill.getEndTime().toLocalDate().equals(contract.getEndTime().toLocalDate())) {
			while (beforeBill.getEndTime().plusMonths(contract.getPayType().equals("1") ? 1 : contract.getPayType().equals("2") ? 3 : 12).isBefore(contract.getEndTime())) {
			System.err.println("生成后续账单");
			TBill tBill = new TBill();
			tBill.setContractId(contract.getId());
			tBill.setStartTime(beforeBill.getEndTime().plusDays(1));
			tBill.setEndTime(beforeBill.getEndTime().plusMonths(contract.getPayType().equals("1") ? 1 : contract.getPayType().equals("2") ? 3 : 12).with(TemporalAdjusters.lastDayOfMonth()));
			tBill.setContractNumber(contract.getContractNumber());
			if (beforeBill.getEndTime().plusMonths(contract.getPayType().equals("1") ? 1 : contract.getPayType().equals("2") ? 3 : 12).getDayOfMonth() <= 15) {
			tBill.setPayableFeesTime(contract.getEndTime().toLocalDate());
			@@ -381,6 +384,7 @@
			}
			tBill.setContractId(contract.getId());
			if (contract.getIsIncreasing()) {
			System.err.println("执行递增递减");
			if (tContractRentType != null) {
			// 如果变过并且时间在递增递减时间段内
			if (contract.getChangeTime() != null) {
			@@ -390,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()));
			// 递增递减的租金
			BigDecimal contractRentTypeMoney = new BigDecimal("0");
			// 不递增递减的租金
			@@ -441,7 +445,7 @@
			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()));
			// 递增递减的租金
			BigDecimal contractRentTypeMoney = new BigDecimal("0");
			// 不递增递减的租金
			@@ -490,12 +494,15 @@
			tBill.setPayableFeesMoney(contract.getChangeRent().multiply(new BigDecimal(contract.getPayType().equals("1") ? 1 : contract.getPayType().equals("2") ? 3 : 12)));
			tBill.setOutstandingMoney(tBill.getPayableFeesMoney());
			}
			}else {
			System.err.println("不执行递增递减");
			tBill.setPayableFeesMoney(contract.getChangeRent().multiply(new BigDecimal(contract.getPayType().equals("1") ? 1 : contract.getPayType().equals("2") ? 3 : 12)));
			tBill.setOutstandingMoney(tBill.getPayableFeesMoney());
			}
			tBill.setContractNumber(contract.getContractNumber());
			tBill.setPayFeesStatus("1");
			tBill.setBillType("1");
			tBill.setStartTime(beforeBill.getEndTime().plusDays(1));
			tBill.setEndTime(beforeBill.getEndTime().plusMonths(contract.getPayType().equals("1") ? 1 : contract.getPayType().equals("2") ? 3 : 12).with(TemporalAdjusters.lastDayOfMonth()));

			billService.save(tBill);
			beforeBill.setEndTime(beforeBill.getEndTime().plusMonths(contract.getPayType().equals("1") ? 1 : contract.getPayType().equals("2") ? 3 : 12).with(TemporalAdjusters.lastDayOfMonth()));
			}
			@@ -515,6 +522,7 @@
			tBill.setBillType("1");
			tBill.setStartTime(beforeBill.getEndTime().plusDays(1));
			tBill.setEndTime(contract.getEndTime());
			tBill.setContractNumber(contract.getContractNumber());
			if (contract.getIsIncreasing()) {
			if (tContractRentType != null) {
			// 如果变过并且时间在递增递减时间段内
			@@ -525,7 +533,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()));
			// 递增递减的租金
			BigDecimal contractRentTypeMoney = new BigDecimal("0");
			// 不递增递减的租金
			@@ -576,7 +584,7 @@
			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()));
			// 递增递减的租金
			BigDecimal contractRentTypeMoney = new BigDecimal("0");
			// 不递增递减的租金
			@@ -636,17 +644,15 @@
			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 (beforeBill.getEndTime().plusMonths(contract.getPayType().equals("1") ? 1 : contract.getPayType().equals("2") ? 3 : 12).getDayOfMonth() <= 15) {
			tBill.setPayableFeesTime(contract.getEndTime().withHour(0).withMinute(0).withSecond(0).toLocalDate());
			} else {
			tBill.setPayableFeesTime((contract.getPayType().equals("1") ?
			beforeBill.getEndTime().plusMonths(1).withDayOfMonth(15).toLocalDate() : contract.getPayType().equals("2") ?
			beforeBill.getEndTime().plusMonths(3).withDayOfMonth(15).toLocalDate() : beforeBill.getEndTime().withDayOfMonth(15).plusMonths(12).withHour(0).withMinute(0).withSecond(0).toLocalDate()));
			if (tBill.getEndTime().getDayOfMonth()>=15){
			tBill.setPayableFeesTime(tBill.getStartTime().withDayOfMonth(15).toLocalDate());
			}else if (tBill.getStartTime().getYear()==tBill.getEndTime().getYear()&& tBill.getStartTime().getMonthValue()==tBill.getEndTime().getMonthValue()){
			// 如果同年同月且日小于15 缴费时间取合同
			tBill.setPayableFeesTime(tBill.getStartTime().toLocalDate());
			}else{
			tBill.setPayableFeesTime(tBill.getStartTime().withDayOfMonth(15).toLocalDate());
			}

			billService.save(tBill);
			}
			break;