From c083c8c5b3a2d5d9b5686f091575ace702031ca4 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 28 二月 2025 18:02:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java |   25 +++++++------------------
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java     |    1 +
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java
index 17a0f0c..f074175 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java
@@ -55,6 +55,7 @@
 
     @ApiOperation(value = "上传开票凭证")
     @PostMapping("/uploadVoucher")
+    @PreAuthorize("@ss.hasPermi('invoice:list:payment')")
     public R<Boolean> uploadVoucher(@RequestBody TInvoiceQuery query) {
         TInvoice tInvoice = new TInvoice();
         tInvoice.setId(query.getId());
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 528af73..ad9548e 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
@@ -206,11 +206,8 @@
         rentBill.setContractId(contract.getId());
         rentBill.setContractNumber(contract.getContractNumber());
         rentBill.setPayableFeesTime(firstPayTime.toLocalDate());
-        if (firstPayTime.toLocalDate().equals(LocalDate.now())){
-            rentBill.setPayFeesStatus("1");
-        }else {
-            rentBill.setPayFeesStatus("2");
-        }
+        rentBill.setPayFeesStatus("1");
+
         rentBill.setBillType("1");
         rentBill.setStartTime(contract.getStartPayTime());
         TContractRentType tContractRentType = contractRentTypes.stream().filter(e -> e.getContractId().equals(contract.getId())).findFirst().orElse(null);
@@ -285,13 +282,10 @@
         depositBill.setStartTime(contract.getStartPayTime());
         depositBill.setEndTime(contract.getEndTime());
         depositBill.setPayableFeesTime(firstPayTime.toLocalDate());
-        if (firstPayTime.toLocalDate().equals(LocalDate.now())){
-            depositBill.setPayFeesStatus("1");
 
-        }else {
-            depositBill.setPayFeesStatus("2");
+        depositBill.setPayFeesStatus("1");
 
-        }
+
         depositBill.setBillType("2");
         this.updateById(contract);
         billService.save(rentBill);
@@ -471,10 +465,10 @@
                                     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.setPayFeesStatus("2");
+                        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));
+                        tBill.setEndTime(beforeBill.getEndTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12).with(TemporalAdjusters.lastDayOfMonth()));
                         billMapper.insert(tBill);
                     }
                 beforeBill.setEndTime(beforeBill.getEndTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12));
@@ -488,11 +482,6 @@
                 .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();
@@ -646,7 +635,7 @@
 
                 }
             }else{
-                long allDays = ChronoUnit.DAYS.between(beforeBill.getEndTime(), contract.getEndTime());
+                long allDays = ChronoUnit.DAYS.between(beforeBill.getEndTime().plusDays(1), contract.getEndTime());
                 tBill.setPayableFeesMoney(contract.getMonthRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(allDays)));
                 tBill.setOutstandingMoney(tBill.getPayableFeesMoney());
 

--
Gitblit v1.7.1