From b2738da3832b84beb0bc657b4a6bcf0c7ca152b0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 17 一月 2025 18:32:49 +0800
Subject: [PATCH] 修改出账期

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java
index c5eed9e..a20b110 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java
@@ -199,7 +199,7 @@
             // 获取该月份的最后一天
             LocalDate lastDayOfMonth = date.with(TemporalAdjusters.lastDayOfMonth());
             QueryWrapper<TChargingOrder> eq = new QueryWrapper<TChargingOrder>()
-                    .between("create_time", firstDayOfMonth, lastDayOfMonth)
+                    .between("pay_time", firstDayOfMonth.atTime(0, 0, 0), lastDayOfMonth.atTime(23, 59, 59))
                     .eq("status", 5)
                     .eq("recharge_payment_status", 2);
             if (chargingBillListVO.getType() == 2) {
@@ -505,6 +505,7 @@
         return chargingBillVO;
     }
 
+
     @Override
     public ChargingBillVO chargingBillList(ChargingListQuery dto) {
         if (dto.getState()!=null){
@@ -639,7 +640,7 @@
             // 获取该月份的最后一天
             LocalDate lastDayOfMonth = date.with(TemporalAdjusters.lastDayOfMonth());
             QueryWrapper<TChargingOrder> eq = new QueryWrapper<TChargingOrder>()
-                    .between("create_time", firstDayOfMonth, lastDayOfMonth)
+                    .between("pay_time", firstDayOfMonth.atTime(0, 0, 0), lastDayOfMonth.atTime(23, 59, 59))
                     .eq("status", 5)
                     .eq("recharge_payment_status", 2);
             if (chargingBillListVO.getType() == 2) {
@@ -930,11 +931,15 @@
     }
 
     public static void main(String[] args) {
-        int i = 8 % 20;
-        System.err.println(i);
-        LocalDateTime now = LocalDateTime.now();
-        // 将时间转化为字符串 只保留年月日 格式为yyyy-MM-dd
-        String format = now.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+        LocalDateTime localDateTime = LocalDateTime.now().minusMonths(1);
+        // 获取 LocalDate 对象
+        LocalDate date = localDateTime.toLocalDate();
+//            // 获取该月份的第一天
+        LocalDate firstDayOfMonth = date.withDayOfMonth(1);
+        // 获取该月份的最后一天
+        LocalDate lastDayOfMonth = date.with(TemporalAdjusters.lastDayOfMonth());
+        System.err.println(firstDayOfMonth);
+        System.err.println(lastDayOfMonth);
     }
 
 }

--
Gitblit v1.7.1