java/xizang.git

			@@ -270,6 +270,8 @@
			contractService.updateContractAuditStatus(processParameter.getString("projectId"), submitStatus);
			TContract contract = contractService.getById(processParameter.getString("projectId"));
			List<TContractRentType> contractRentTypes = contractRentTypeService.list();
			TContractRentType tContractRentType = contractRentTypes.stream().filter(e -> e.getContractId().equals(contract.getId())).findFirst().orElse(null);

			// 生成第一笔账单
			// 第一次应缴费日期
			LocalDateTime firstPayTime = contract.getStartTime().plusDays(10).withHour(0).withMinute(0).withSecond(0);
			@@ -281,26 +283,20 @@

			rentBill.setBillType("1");
			rentBill.setStartTime(contract.getStartPayTime());
			if (contract.getFirstPayTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12).isAfter(contract.getEndTime())){
			rentBill.setEndTime(contract.getFirstPayTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12));
			if (rentBill.getStartTime().with(TemporalAdjusters.lastDayOfMonth()).isAfter(contract.getEndTime())) {
			if (rentBill.getStartTime().getDayOfMonth() != 1) {
			rentBill.setEndTime(rentBill.getStartTime().with(TemporalAdjusters.lastDayOfMonth()));
			} else {
			rentBill.setEndTime(rentBill.getStartTime().plusMonths(contract.getPayType().equals("1") ? 1 : contract.getPayType().equals("2") ? 3 : 12).with(TemporalAdjusters.lastDayOfMonth()));
			}
			}else{
			rentBill.setEndTime(contract.getEndTime());
			}
			TContractRentType tContractRentType = contractRentTypes.stream().filter(e -> e.getContractId().equals(contract.getId())).findFirst().orElse(null);
			if (tContractRentType!=null && rentBill.getEndTime().isAfter(tContractRentType.getChangeTime()) ){
			long moneyDays = 0;
			switch (contract.getPayType()){
			case "1":
			break;
			case "2":
			break;
			case "3":
			break;

			}
			moneyDays = ChronoUnit.DAYS.between(tContractRentType.getChangeTime(), rentBill.getEndTime());
			// 计算租金变动的天数
			moneyDays = Math.abs(ChronoUnit.DAYS.between(tContractRentType.getChangeTime(), contract.getStartPayTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12))+1L);
			contract.setChangeTime(LocalDateTime.now());
			contract.setChangeTime(tContractRentType.getChangeTime());
			// 递增递减的租金
			BigDecimal contractRentTypeMoney = new BigDecimal("0");
			// 不递增递减的租金
			@@ -311,11 +307,12 @@
			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);
			// 变动后的每月租金
			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)).divide(new BigDecimal(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12),2,BigDecimal.ROUND_DOWN));
			contract.setChangeRent(contractRentTypeMoney);
			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;
			@@ -323,41 +320,22 @@
			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);
			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(contractRentTypeMoney);

			contract.setChangeRent(contract.getChangeRent().subtract(tContractRentType.getNumericalValue()));
			break;
			}
			break;
			}
			// 不需要涨租金的时间段
			long originalDays = ChronoUnit.DAYS.between(contract.getFirstPayTime(), tContractRentType.getChangeTime());
			long originalDays = Math.abs(ChronoUnit.DAYS.between(contract.getFirstPayTime(), tContractRentType.getChangeTime()));
			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{
			if (contract.getFirstPayTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12).isAfter(contract.getEndTime())){
			rentBill.setEndTime(contract.getEndTime());

			}else{
			LocalDateTime firstPayTime1 = contract.getFirstPayTime();
			// 根据支付方式设置账单endTime
			if (contract.getPayType().equals("1")){
			rentBill.setEndTime(firstPayTime1.with(TemporalAdjusters.lastDayOfMonth()));
			}else if (contract.getPayType().equals("2")){
			firstPayTime1 = firstPayTime1.plusMonths(3);
			rentBill.setEndTime(firstPayTime1.with(TemporalAdjusters.lastDayOfMonth()));

			}else if (contract.getPayType().equals("3")){
			firstPayTime1 = firstPayTime1.plusMonths(12);
			rentBill.setEndTime(firstPayTime1.with(TemporalAdjusters.lastDayOfMonth()));
			}
			}
			// 不走递增递减
			long allDays = ChronoUnit.DAYS.between(contract.getStartPayTime(), rentBill.getEndTime());
			int dayOfMonth = rentBill.getStartTime().getDayOfMonth();
			@@ -390,168 +368,9 @@
			TBill beforeBill = billService.lambdaQuery().eq(TBill::getContractId, contract.getId()).eq(TBill::getBillType, 1).orderByDesc(TBill::getCreateTime)
			.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())){
			TBill tBill = new TBill();
			tBill.setContractId(contract.getId());
			tBill.setContractNumber(contract.getContractNumber());
			// 根据支付方式判断需不需要生成订单
			if (!(beforeBill.getEndTime().toLocalDate().equals(contract.getEndTime().toLocalDate()))
			&&
			(contract.getPayType().equals("1")?
			beforeBill.getEndTime().plusMonths(1):contract.getPayType().equals("2")?
			beforeBill.getEndTime().plusMonths(3):beforeBill.getEndTime().plusMonths(12))
			.with(TemporalAdjusters.lastDayOfMonth()).isBefore(contract.getEndTime())
			&& beforeBill.getEndTime().isBefore(contract.getEndTime())
			){
			tBill.setContractId(contract.getId());
			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());
			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{
			// 之前已经涨、跌过租金了需要判断周期是否还需要再涨、跌
			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{

			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());
			if (beforeBill.getEndTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12).getDayOfMonth()<=15){
			tBill.setPayableFeesTime(contract.getEndTime().toLocalDate());
			@@ -560,16 +379,129 @@
			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.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());
			}
			}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());
			}
			}
			} 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();
			}
			@@ -768,7 +700,6 @@
			int size = checkAcceptRecordMapper.selectList(new LambdaQueryWrapper<TCheckAcceptRecord>()
			.likeRight(TCheckAcceptRecord::getAcceptanceTime, LocalDate.now())).size();
			tCheckAcceptRecord.setCode(replace.substring(2)+String.format("%03d", size+1));



			checkAcceptRecordMapper.insert(tCheckAcceptRecord);