java/xizang.git

			@@ -379,8 +379,143 @@
			beforeBill.getEndTime().plusMonths(1).withDayOfMonth(15).toLocalDate() : contract.getPayType().equals("2") ?
			beforeBill.getEndTime().plusMonths(3).withDayOfMonth(15).toLocalDate() : beforeBill.getEndTime().withDayOfMonth(15).plusMonths(12).toLocalDate()));
			}
			// 根据支付方式判断需不需要生成订单
			tBill.setContractId(contract.getId());
			if (contract.getIsIncreasing()) {
			if (tContractRentType != null) {
			// 如果变过并且时间在递增递减时间段内
			if (contract.getChangeTime() != null) {
			// 下次递增递减时间
			LocalDateTime changeTime = contract.getChangeTime().plusYears(tContractRentType.getCycleTime());
			// 之前已经涨、跌过租金了需要判断周期是否还需要再涨、跌
			if (changeTime.isBefore(tBill.getEndTime()) && changeTime.isAfter(tBill.getStartTime())) {
			contract.setChangeTime(changeTime);
			// 租金递增递减的时长天
			long moneyDays = Math.abs(ChronoUnit.DAYS.between(tContractRentType.getChangeTime(), beforeBill.getEndTime()));
			// 递增递减的租金
			BigDecimal contractRentTypeMoney = new BigDecimal("0");
			// 不递增递减的租金
			BigDecimal originalMoney = new BigDecimal("0");
			// 原租金
			switch (tContractRentType.getIncreasingDecreasingType()) {
			case 1:
			switch (tContractRentType.getIncreasingDecreasing()) {
			case 1:
			contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().multiply(new BigDecimal(100).add(tContractRentType.getNumericalValue())).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays)));
			// 变动后的每月租金
			contract.setChangeRent(contract.getChangeRent().multiply(new BigDecimal(100).add(tContractRentType.getNumericalValue())).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN));
			break;
			case 2:
			contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().multiply((new BigDecimal(100).subtract(tContractRentType.getNumericalValue()))).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays)));
			contract.setChangeRent(contract.getChangeRent().multiply((new BigDecimal(100).subtract(tContractRentType.getNumericalValue()))).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN));
			break;
			}
			break;
			case 2:
			switch (tContractRentType.getIncreasingDecreasing()) {
			case 1:
			contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().add(tContractRentType.getNumericalValue())).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays));
			contract.setChangeRent(contract.getChangeRent().add(tContractRentType.getNumericalValue()));
			break;
			case 2:
			contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().subtract(tContractRentType.getNumericalValue())).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays));
			contract.setChangeRent(contract.getChangeRent().subtract(tContractRentType.getNumericalValue()));
			break;
			}
			break;
			}
			// 不需要涨租金的时间段
			long originalDays = ChronoUnit.DAYS.between(beforeBill.getEndTime(), tContractRentType.getChangeTime());
			if (originalDays > 0) {
			originalMoney = originalMoney.add(contract.getChangeRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN))
			.multiply(new BigDecimal(originalDays));
			}
			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{
			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()));
			// 递增递减的租金
			BigDecimal contractRentTypeMoney = new BigDecimal("0");
			// 不递增递减的租金
			BigDecimal originalMoney = new BigDecimal("0");
			// 原租金
			switch (tContractRentType.getIncreasingDecreasingType()) {
			case 1:
			switch (tContractRentType.getIncreasingDecreasing()) {
			case 1:
			contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().multiply(new BigDecimal(100).add(tContractRentType.getNumericalValue())).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays)));
			// 变动后的每月租金
			contract.setChangeRent(contract.getChangeRent().multiply(new BigDecimal(100).add(tContractRentType.getNumericalValue())).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN));
			break;
			case 2:
			contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().multiply((new BigDecimal(100).subtract(tContractRentType.getNumericalValue()))).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays)));
			contract.setChangeRent(contract.getChangeRent().multiply((new BigDecimal(100).subtract(tContractRentType.getNumericalValue()))).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN));
			break;
			}
			break;
			case 2:
			switch (tContractRentType.getIncreasingDecreasing()) {
			case 1:
			contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().add(tContractRentType.getNumericalValue())).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays));
			contract.setChangeRent(contract.getChangeRent().add(tContractRentType.getNumericalValue()));
			break;
			case 2:
			contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().subtract(tContractRentType.getNumericalValue())).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays));
			contract.setChangeRent(contract.getChangeRent().subtract(tContractRentType.getNumericalValue()));
			break;
			}
			break;
			}
			// 不需要涨租金的时间段
			long originalDays = ChronoUnit.DAYS.between(beforeBill.getEndTime(), tContractRentType.getChangeTime());
			if (originalDays > 0) {
			originalMoney = originalMoney.add(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN))
			.multiply(new BigDecimal(originalDays));
			}
			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());

			}
			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()));
			}
			}
			}
			} catch (Exception e) {
			e.printStackTrace();
			}
			TBill beforeBill = billService.lambdaQuery().eq(TBill::getContractId, contract.getId()).eq(TBill::getBillType, 1).orderByDesc(TBill::getStartTime)
			.last("limit 1").one();
			// 生成最后一笔账单
			if (!(beforeBill.getEndTime().toLocalDate().equals(contract.getEndTime().toLocalDate()))
			&& beforeBill.getEndTime().isBefore(contract.getEndTime())
			) {
			TBill tBill = new TBill();
			tBill.setContractId(contract.getId());
			tBill.setPayFeesStatus("1");
			tBill.setBillType("1");
			tBill.setStartTime(beforeBill.getEndTime().plusDays(1));
			tBill.setEndTime(contract.getEndTime());
			if (contract.getIsIncreasing()) {
			if (tContractRentType != null) {
			// 如果变过并且时间在递增递减时间段内
			@@ -478,196 +613,28 @@
			// 不需要涨租金的时间段
			long originalDays = ChronoUnit.DAYS.between(beforeBill.getEndTime(), tContractRentType.getChangeTime());
			if (originalDays > 0) {
			originalMoney = originalMoney.add(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN))
			originalMoney = originalMoney.add(contract.getChangeRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN))
			.multiply(new BigDecimal(originalDays));
			}
			tBill.setPayableFeesMoney(contractRentTypeMoney.add(originalMoney));
			tBill.setOutstandingMoney(tBill.getPayableFeesMoney());
			contractService.updateById(contract);

			}
			}
			} else {

			tBill.setPayableFeesMoney(contract.getMonthRent().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()));
			}
			}
			}
			} catch (Exception e) {
			e.printStackTrace();
			}
			TBill beforeBill = billService.lambdaQuery().eq(TBill::getContractId, contract.getId()).eq(TBill::getBillType, 1).orderByDesc(TBill::getStartTime)
			.last("limit 1").one();
			// 生成最后一笔账单
			if (!(beforeBill.getEndTime().toLocalDate().equals(contract.getEndTime().toLocalDate()))
			&& beforeBill.getEndTime().isBefore(contract.getEndTime())
			) {
			TBill tBill = new TBill();
			tBill.setContractId(contract.getId());
			tBill.setPayFeesStatus("1");
			tBill.setBillType("1");
			tBill.setStartTime(beforeBill.getEndTime().plusDays(1));
			tBill.setEndTime(contract.getEndTime());
			if (contract.getIsIncreasing()) {
			if (tContractRentType != null
			&& beforeBill.getEndTime().isBefore(tContractRentType.getChangeTime())
			&& beforeBill.getEndTime().plusMonths(contract.getPayType().equals("1") ? 1 : contract.getPayType().equals("2") ? 3 : 12).with(TemporalAdjusters.lastDayOfMonth()).isAfter(tContractRentType.getChangeTime())) {
			// 如果没变过
			if (contract.getChangeTime() == null) {
			contract.setChangeTime(LocalDateTime.now());
			// 租金递增递减的时长天
			long moneyDays = ChronoUnit.DAYS.between(tContractRentType.getChangeTime(), contract.getEndTime());
			// 递增递减的租金
			BigDecimal contractRentTypeMoney = new BigDecimal("0");
			// 不递增递减的租金
			BigDecimal originalMoney = new BigDecimal("0");
			// 原租金
			switch (tContractRentType.getIncreasingDecreasingType()) {
			case 1:
			switch (tContractRentType.getIncreasingDecreasing()) {
			case 1:
			contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().multiply(new BigDecimal(100).add(tContractRentType.getNumericalValue())).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays)));
			contract.setChangeRent(contractRentTypeMoney);
			break;
			case 2:
			contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().multiply((new BigDecimal(100).subtract(tContractRentType.getNumericalValue()))).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays)).divide(new BigDecimal(contract.getPayType().equals("1") ? 1 : contract.getPayType().equals("2") ? 3 : 12), 2, BigDecimal.ROUND_DOWN));
			contract.setChangeRent(contractRentTypeMoney);
			break;
			}
			break;
			case 2:
			switch (tContractRentType.getIncreasingDecreasing()) {
			case 1:
			contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().add(tContractRentType.getNumericalValue())).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays));
			contract.setChangeRent(contractRentTypeMoney);
			break;
			case 2:
			contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().subtract(tContractRentType.getNumericalValue())).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays));
			contract.setChangeRent(contractRentTypeMoney);

			break;
			}
			break;
			}
			// 不需要涨租金的时间段
			long originalDays = ChronoUnit.DAYS.between(beforeBill.getEndTime(), tContractRentType.getChangeTime());

			// 不需要涨租金的时间段
			if (contract.getFirstPayTime().isBefore(tContractRentType.getChangeTime())) {
			originalMoney = originalMoney.add(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN))
			.multiply(new BigDecimal(originalDays));
			tBill.setPayableFeesMoney(contractRentTypeMoney.add(originalMoney));
			if (tBill.getStartTime().getDayOfMonth()==1 && tBill.getEndTime().toLocalDate().equals(tBill.getEndTime().with(TemporalAdjusters.lastDayOfMonth()).toLocalDate())){
			tBill.setPayableFeesMoney(contract.getChangeRent().multiply(new BigDecimal(contract.getPayType().equals("1") ? 1 : contract.getPayType().equals("2") ? 3 : 12)));
			tBill.setOutstandingMoney(tBill.getPayableFeesMoney());
			} else {
			tBill.setPayableFeesMoney(contractRentTypeMoney);
			// 最后一笔账单时间
			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 ((LocalDateTime.now().getYear() - contract.getChangeTime().getYear()) % tContractRentType.getCycleTime() == 0) {
			contract.setChangeTime(LocalDateTime.now());
			// 租金递增递减的时长天
			long moneyDays = ChronoUnit.DAYS.between(tContractRentType.getChangeTime(), contract.getEndTime());
			// 递增递减的租金
			BigDecimal contractRentTypeMoney = new BigDecimal("0");
			// 不递增递减的租金
			BigDecimal originalMoney = new BigDecimal("0");
			// 原租金
			switch (tContractRentType.getIncreasingDecreasingType()) {
			case 1:
			switch (tContractRentType.getIncreasingDecreasing()) {
			case 1:
			contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().multiply(new BigDecimal(100).add(tContractRentType.getNumericalValue())).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays)));
			contract.setChangeRent(contractRentTypeMoney);
			break;
			case 2:
			contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().multiply((new BigDecimal(100).subtract(tContractRentType.getNumericalValue()))).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays)).divide(new BigDecimal(contract.getPayType().equals("1") ? 1 : contract.getPayType().equals("2") ? 3 : 12), 2, BigDecimal.ROUND_DOWN));
			contract.setChangeRent(contractRentTypeMoney);
			break;
			}
			break;
			case 2:
			switch (tContractRentType.getIncreasingDecreasing()) {
			case 1:
			contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().add(tContractRentType.getNumericalValue())).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays));
			contract.setChangeRent(contractRentTypeMoney);
			break;
			case 2:
			contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().subtract(tContractRentType.getNumericalValue())).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays));
			contract.setChangeRent(contractRentTypeMoney);

			break;
			}
			break;
			}
			// 不需要涨租金的时间段
			long originalDays = ChronoUnit.DAYS.between(beforeBill.getEndTime(), tContractRentType.getChangeTime());
			originalMoney = originalMoney.add(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN))
			.multiply(new BigDecimal(originalDays));
			tBill.setPayableFeesMoney(contractRentTypeMoney.add(originalMoney));
			tBill.setOutstandingMoney(tBill.getPayableFeesMoney());

			} else {
			// 不涨租金用上次的
			// 租金递增递减的时长天
			long moneyDays = ChronoUnit.DAYS.between(tContractRentType.getChangeTime(), contract.getEndTime());
			// 递增递减的租金
			BigDecimal contractRentTypeMoney = new BigDecimal("0");
			// 不递增递减的租金
			BigDecimal originalMoney = new BigDecimal("0");
			// 原租金
			switch (tContractRentType.getIncreasingDecreasingType()) {
			case 1:
			switch (tContractRentType.getIncreasingDecreasing()) {
			case 1:
			contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().multiply(new BigDecimal(100).add(tContractRentType.getNumericalValue())).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays)));
			contract.setChangeRent(contractRentTypeMoney);
			break;
			case 2:
			contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().multiply((new BigDecimal(100).subtract(tContractRentType.getNumericalValue()))).divide(new BigDecimal(100), 2, BigDecimal.ROUND_DOWN).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays)).divide(new BigDecimal(contract.getPayType().equals("1") ? 1 : contract.getPayType().equals("2") ? 3 : 12), 2, BigDecimal.ROUND_DOWN));
			contract.setChangeRent(contractRentTypeMoney);
			break;
			}
			break;
			case 2:
			switch (tContractRentType.getIncreasingDecreasing()) {
			case 1:
			contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().add(tContractRentType.getNumericalValue())).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays));
			contract.setChangeRent(contractRentTypeMoney);
			break;
			case 2:
			contractRentTypeMoney = contractRentTypeMoney.add(contract.getChangeRent().subtract(tContractRentType.getNumericalValue())).divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(moneyDays));
			contract.setChangeRent(contractRentTypeMoney);

			break;
			}
			break;
			}
			// 不需要涨租金的时间段
			long originalDays = ChronoUnit.DAYS.between(beforeBill.getEndTime(), tContractRentType.getChangeTime());
			originalMoney = originalMoney.add(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN))
			.multiply(new BigDecimal(originalDays));
			tBill.setPayableFeesMoney(contractRentTypeMoney.add(originalMoney));
			tBill.setOutstandingMoney(tBill.getPayableFeesMoney());

			}
			}

			}
			} else {
			long allDays = ChronoUnit.DAYS.between(beforeBill.getEndTime(), contract.getEndTime());
			tBill.setPayableFeesMoney(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(allDays)));
			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) {
			@@ -705,7 +672,7 @@
			checkAcceptRecordMapper.insert(tCheckAcceptRecord);
			// 将所有未缴费账单设置未已失效
			List<TBill> tBills = billService.list(new LambdaQueryWrapper<TBill>()
			.in(TBill::getPayFeesStatus, Arrays.asList("1,2,4"))
			.ne(TBill::getPayFeesStatus, 3)
			.eq(TBill::getContractId, contract.getId()));
			for (TBill tBill : tBills) {
			tBill.setPayFeesStatus("5");