From 728a54cc02ff66e38bc8719ecc0f3155e597084c Mon Sep 17 00:00:00 2001
From: zhangmei <645025773@qq.com>
Date: 星期五, 14 二月 2025 15:27:56 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/xiaochen991015/xizang into xizang-changyun
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java | 514 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 477 insertions(+), 37 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java
index 458ec6c..405a874 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java
@@ -17,16 +17,21 @@
import com.ruoyi.system.query.TContractBillQuery;
import com.ruoyi.system.query.TContractQuery;
import com.ruoyi.system.service.TBillService;
+import com.ruoyi.system.service.TContractRentTypeService;
import com.ruoyi.system.service.TContractService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.vo.BillVO;
import com.ruoyi.system.vo.CheckAcceptRecordVO;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.temporal.ChronoUnit;
+import java.time.temporal.TemporalAdjusters;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -118,6 +123,7 @@
CheckAcceptRecordVO checkAcceptRecordVO = new CheckAcceptRecordVO();
TCheckAcceptRecord tCheckAcceptRecord = checkAcceptRecordMapper.selectOne(new LambdaQueryWrapper<TCheckAcceptRecord>()
.eq(TCheckAcceptRecord::getContractId, id));
+ if (tCheckAcceptRecord==null)return checkAcceptRecordVO;
BeanUtils.copyProperties(tCheckAcceptRecord,checkAcceptRecordVO);
THouse tHouse = houseMapper.selectById(tCheckAcceptRecord.getHouseId());
tHouse.setLeaseStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_LEASE_STATUS,tHouse.getLeaseStatus()));
@@ -125,7 +131,8 @@
checkAcceptRecordVO.setHouse(tHouse);
return checkAcceptRecordVO;
}
-
+ @Autowired
+ private TContractRentTypeService contractRentTypeService;
@Override
public R signContract(SignContractDTO dto) {
TContract contract = contractMapper.selectById(dto.getId());
@@ -134,42 +141,475 @@
contract.setSignature(dto.getSignature());
contract.setStatus("2");
contractMapper.updateById(contract);
- // 用户签订合同后 生成第一批账单包含租金账单和押金账单 后续账单通过定时任务生成
- TBill rent = new TBill();
- rent.setContractId(contract.getId());
- // 应缴费租金
- BigDecimal payableFeesMoney = new BigDecimal("0");
- LocalDateTime startTime = contract.getStartTime();
- LocalDateTime endTime = contract.getEndTime();
-// // 计算相差多少天
-// long days = ChronoUnit.DAYS.between(startTime, endTime);
-// // 计算相差多少个月
-// long months = ChronoUnit.MONTHS.between(startTime, endTime);
-// if (months<=31){
-// // 小于等于一个月 合计租金就是首笔账单金额
-// payableFeesMoney = contract.getTotalRent();
-// }else{
-// switch (contract.getPayType()){
-// case "1":
-// break;
-// case "2":
-// break;
-// case "3":
-// break;
-// }
-// }
-//
-// rent.setPayableFeesMoney(payableFeesMoney);
-// rent.setPayableFeesTime(contract.getFirstPayTime());
-// rent.setPayFeesStatus("1");
-// rent.setBillType("1");
-//
-// TBill deposit = new TBill();
-// deposit.setContractId(contract.getId());
-// deposit.setPayableFeesMoney(contract.getDeposit());
-// deposit.setPayableFeesTime(contract.getFirstPayTime());
-// deposit.setPayFeesStatus("1");
-// deposit.setBillType("2");
+ contract.setFirstPayTime(contract.getStartTime().plusDays(10));
+ List<TBill> bills = new ArrayList<>();
+ List<TContractRentType> contractRentTypes = contractRentTypeService.list();
+ // 生成第一笔账单
+ // 第一次应缴费日期
+ LocalDateTime firstPayTime = contract.getStartTime().plusDays(10).withHour(0).withMinute(0).withSecond(0);
+ TBill rentBill = new TBill();
+ rentBill.setContractId(contract.getId());
+ rentBill.setContractNumber(contract.getContractNumber());
+ rentBill.setPayableFeesTime(firstPayTime);
+ if (firstPayTime.toLocalDate().equals(LocalDate.now())){
+ rentBill.setPayFeesStatus("1");
+ }else {
+ rentBill.setPayFeesStatus("2");
+ }
+ rentBill.setBillType("1");
+ rentBill.setStartTime(contract.getStartPayTime());
+ TContractRentType tContractRentType = contractRentTypes.stream().filter(e -> e.getContractId().equals(contract.getId())).findFirst().orElse(null);
+ if (tContractRentType!=null && contract.getStartPayTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12).isAfter(tContractRentType.getChangeTime())){
+ // 计算租金变动的天数
+ long moneyDays = ChronoUnit.DAYS.between(tContractRentType.getChangeTime(), contract.getStartPayTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12))+1L;
+ contract.setChangeTime(LocalDateTime.now());
+ // 递增递减的租金
+ 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(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().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{
+ rentBill.setEndTime(contract.getEndTime());
+ }
+ }else{
+ 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{
+ rentBill.setEndTime(contract.getEndTime());
+ }
+ // 不走递增递减
+ long allDays = ChronoUnit.DAYS.between(contract.getFirstPayTime(), rentBill.getEndTime());
+ rentBill.setPayableFeesMoney(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(allDays)));
+ rentBill.setOutstandingMoney(rentBill.getPayableFeesMoney());
+
+ }
+ // 押金账单
+ TBill depositBill = new TBill();
+ depositBill.setContractId(contract.getId());
+ depositBill.setContractNumber(contract.getContractNumber());
+ depositBill.setPayableFeesMoney(contract.getDeposit());
+ depositBill.setOutstandingMoney(depositBill.getPayableFeesMoney());
+ depositBill.setStartTime(contract.getStartPayTime());
+ depositBill.setEndTime(contract.getEndTime());
+ depositBill.setPayableFeesTime(firstPayTime);
+ if (firstPayTime.toLocalDate().equals(LocalDate.now())){
+ depositBill.setPayFeesStatus("1");
+
+ }else {
+ depositBill.setPayFeesStatus("2");
+
+ }
+ depositBill.setBillType("2");
+ this.updateById(contract);
+ billService.save(rentBill);
+ billService.save(depositBill);
+ // 生成后续账单
+ try {
+ 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{
+ long allDays = ChronoUnit.DAYS.between(beforeBill.getEndTime(), (contract.getPayType().equals("1")?
+ beforeBill.getEndTime().plusMonths(1):contract.getPayType().equals("2")?
+ beforeBill.getEndTime().plusMonths(3):beforeBill.getEndTime().plusMonths(12)).with(TemporalAdjusters.lastDayOfMonth()));
+ 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){
+ tBill.setPayableFeesTime(contract.getEndTime());
+ }else{
+ tBill.setPayableFeesTime((contract.getPayType().equals("1")?
+ beforeBill.getEndTime().plusMonths(1).withDayOfMonth(15):contract.getPayType().equals("2")?
+ beforeBill.getEndTime().plusMonths(3).withDayOfMonth(15):beforeBill.getEndTime().withDayOfMonth(15).plusMonths(12)));
+ }
+ tBill.setPayFeesStatus("2");
+ tBill.setBillType("1");
+ tBill.setStartTime(beforeBill.getEndTime().plusDays(1));
+ tBill.setEndTime(contract.getEndTime());
+ }
+ billMapper.insert(tBill);
+ }
+ }
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ 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()))
+ &&
+ (contract.getPayType().equals("1")?
+ beforeBill.getEndTime().plusMonths(1):contract.getPayType().equals("2")?
+ beforeBill.getEndTime().plusMonths(3):beforeBill.getEndTime().plusMonths(12))
+ .with(TemporalAdjusters.lastDayOfMonth()).isAfter(contract.getEndTime())
+ && beforeBill.getEndTime().isBefore(contract.getEndTime())
+ ){
+ TBill tBill = new TBill();
+ 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());
+
+ // 不需要涨租金的时间段
+ 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));
+ tBill.setOutstandingMoney(tBill.getPayableFeesMoney());
+ }else{
+ tBill.setPayableFeesMoney(contractRentTypeMoney);
+ 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){
+ tBill.setPayableFeesTime(contract.getEndTime().withHour(0).withMinute(0).withSecond(0));
+ }else{
+ tBill.setPayableFeesTime((contract.getPayType().equals("1")?
+ beforeBill.getEndTime().plusMonths(1).withDayOfMonth(15):contract.getPayType().equals("2")?
+ beforeBill.getEndTime().plusMonths(3).withDayOfMonth(15):beforeBill.getEndTime().withDayOfMonth(15).plusMonths(12).withHour(0).withMinute(0).withSecond(0)));
+ }
+ 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));
+ billService.save(tBill);
+ }
+
return R.ok();
}
--
Gitblit v1.7.1