java/xizang.git

			@@ -76,7 +76,6 @@
			private TCheckAcceptRecordService checkAcceptRecordService;
			@ApiOperation(value = "测试生成账单")
			@PostMapping(value = "/testBill")

			public R testBill(String id) {
			TContract contract = contractService.getById(id);
			// 查询所有已签订的合同并且未生成第一笔账单的
			@@ -86,21 +85,9 @@
			contract.setFirstPayTime(contract.getStartTime().plusDays(10));
			// 第一次应缴费日期
			LocalDateTime firstPayTime = contract.getStartTime().plusDays(10).withHour(0).withMinute(0).withSecond(0);
			LocalDate localDate = contract.getStartTime().plusDays(10).toLocalDate();
			LocalDate now = LocalDate.now();
			TBill rentBill = new TBill();
			rentBill.setContractId(contract.getId());
			rentBill.setContractNumber(contract.getContractNumber());
			LocalDateTime startPayTime = contract.getStartPayTime();
			LocalDateTime endTime1 = contract.getEndTime();
			// // 计算两个时间相差多少天
			// // 如果时间小于30天需要计算每日租金
			// if (days<30){
			// rentBill.setPayableFeesMoney(contract.getMonthRent().divide(new BigDecimal("30"),2,BigDecimal.ROUND_DOWN).multiply(new BigDecimal(days)));
			// }else{
			// rentBill.setPayableFeesMoney(contract.getPayType().equals("1")?contract.getMonthRent():
			// contract.getPayType().equals("2")?contract.getMonthRent().multiply(new BigDecimal("3")):contract.getMonthRent().multiply(new BigDecimal("12")).setScale(2,BigDecimal.ROUND_DOWN));
			// }
			rentBill.setPayableFeesTime(firstPayTime);
			rentBill.setPayFeesStatus("1");
			rentBill.setBillType("1");
			@@ -121,11 +108,11 @@
			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.add(contract.getChangeRent().multiply(new BigDecimal(100).add(tContractRentType.getNumericalValue())).divide(new BigDecimal(100),2,BigDecimal.ROUND_DOWN)));
			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)));
			contract.setChangeRent(contractRentTypeMoney.add(contract.getChangeRent().multiply(new BigDecimal(100).subtract(tContractRentType.getNumericalValue())).divide(new BigDecimal(100),2,BigDecimal.ROUND_DOWN)));
			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;
			@@ -133,22 +120,28 @@
			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.add(contract.getChangeRent().add(tContractRentType.getNumericalValue())));
			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.add(contract.getChangeRent().subtract(tContractRentType.getNumericalValue())));
			contract.setChangeRent(contractRentTypeMoney);

			break;
			}
			break;
			}
			// 不需要涨租金的时间段
			long originalDays = 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());
			if (contract.getFirstPayTime().isBefore(tContractRentType.getChangeTime())){
			long originalDays = 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{
			rentBill.setPayableFeesMoney(contractRentTypeMoney);
			rentBill.setOutstandingMoney(rentBill.getPayableFeesMoney());
			}

			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));
			}else{
			@@ -235,8 +228,7 @@
			@PreAuthorize("@ss.hasPermi('system:contract:delete')")

			@DeleteMapping(value = "/deleteContractByIds")
			public R<Boolean> deleteContractByIds
			(@RequestParam String ids) {
			public R<Boolean> deleteContractByIds(@RequestParam String ids) {
			if (StringUtils.isNotEmpty(ids)){
			contractService.removeBatchByIds(Arrays.asList(ids.split(",")));
			}