修改管理费创建订单接口，添加账期类型接口

src/main/java/com/template/api/HouseOrderAPI.java

@@ -157,5 +157,9 @@ public interface HouseOrderAPI {
     @ApiOperation(value = "统计报表详情", notes = "统计报表详情", httpMethod = "GET")
     CommonResult reportStatisticsParticulars(@RequestParam Integer id);
 
+    @GetMapping("/dateBillType")
+    @ApiOperation(value = "账期列表", notes = "账期列表", httpMethod = "GET")
+    CommonResult dateBillType();
+
 }
 

src/main/java/com/template/controller/HouseNumberStateController.java

@@ -25,9 +25,11 @@ import org.springframework.web.bind.annotation.RestController;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.time.Duration;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
@@ -847,9 +849,10 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         LocalDateTime start = LocalDateTime.parse(reserveLiveTime, dateTimeFormatter);
         LocalDateTime end = LocalDateTime.parse(reserveLeaveTime, dateTimeFormatter);
-        int dayOfYear = start.getDayOfYear();
-        int dayOfYear1 = end.getDayOfYear();
-        int diff = dayOfYear1 - dayOfYear;
+
+        LocalDate startDate = start.toLocalDate();
+        LocalDate endDate = end.toLocalDate();
+        long diff =startDate.until(endDate, ChronoUnit.DAYS);
         houseOrder.setLiveDay(String.valueOf(diff));
 //        房间单价
         houseOrder.setPrice(priceVo.getPrice());

src/main/java/com/template/controller/HouseOrderController.java

@@ -60,6 +60,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
 import java.security.Signature;
 import java.text.SimpleDateFormat;
+import java.time.Duration;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -3852,6 +3853,13 @@ public class HouseOrderController implements HouseOrderAPI {
         return CommonResult.ok(vo);
     }
 
+    @Override
+    public CommonResult dateBillType() {
+        List<String> dateBillTypeList=houseOrderService.dateBillType();
+
+        return CommonResult.ok(dateBillTypeList);
+    }
+
 
     public static void main(String[] args) throws Exception {
 //        获取签名
@@ -3873,18 +3881,17 @@ public class HouseOrderController implements HouseOrderAPI {
 //        String a="第一个订单"+"\n"+"第二个订单";
 //        System.out.println(a);
 
-        DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-        DateTimeFormatter dateTimeFormatter2 = DateTimeFormatter.ofPattern("yyyy-MM");
 
-//        计算上个免费的订单
-        LocalDateTime end = LocalDateTime.now().withDayOfMonth(1).withHour(0).withMinute(0).withSecond(0);
-        LocalDateTime start = end.minusMonths(1);
+        //      入住天数
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        LocalDateTime start = LocalDateTime.parse("2024-12-31 15:17:27", dateTimeFormatter);
+        LocalDateTime end = LocalDateTime.parse("2025-01-01 13:00:00", dateTimeFormatter);
 
-        String dateBill=start.toLocalDate().format(dateTimeFormatter2);
-        String dateBill2=start.format(dateTimeFormatter2);
-        System.out.println("dateBill = " + dateBill);
-        System.out.println("dateBill2 = " + dateBill2);
+        LocalDate startDate = start.toLocalDate();
+        LocalDate endDate = end.toLocalDate();
 
+        int daysBetween = (int) startDate.until(endDate, ChronoUnit.DAYS);
+        System.out.println("daysBetween = " + daysBetween);
     }
 
     /**

src/main/java/com/template/mapper/HouseOrderMapper.java

@@ -59,4 +59,6 @@ public interface HouseOrderMapper extends BaseMapper<HouseOrder> {
     List<HouseOrderElectricVo> getElectric(@Param("houseOrderSource") String houseOrderSource);
 
     List<HouseOrderWaterAndElectricVo> getWaterAndElectric(@Param("houseOrderSource") String houseOrderSource);
+
+    List<String> dateBillType();
 }

src/main/java/com/template/services/HouseOrderService.java

@@ -63,4 +63,7 @@ public interface HouseOrderService extends IService<HouseOrder> {
     List<HouseOrderElectricVo> getElectric(String houseOrderSource);
 
     List<HouseOrderWaterAndElectricVo> getWaterAndElectric(String houseOrderSource);
+
+    List<String> dateBillType();
+
 }

src/main/java/com/template/services/impl/HouseOrderServziceImpl.java

@@ -523,4 +523,9 @@ public class HouseOrderServziceImpl extends ServiceImpl<HouseOrderMapper, HouseO
     public List<HouseOrderWaterAndElectricVo> getWaterAndElectric(String houseOrderSource) {
         return houseOrderMapper.getWaterAndElectric(houseOrderSource);
     }
+
+    @Override
+    public List<String> dateBillType() {
+        return houseOrderMapper.dateBillType();
+    }
 }

src/main/resources/mapper/template/HouseOrderMapper.xml

@@ -426,5 +426,15 @@
             deleted=0
           AND FIND_IN_SET(ho.id,#{houseOrderSource})
     </select>
+    <select id="dateBillType" resultType="java.lang.String">
+        SELECT
+            date_bill
+        FROM
+            `house_order`
+        WHERE
+            deleted=0
+        GROUP BY date_bill
+        ORDER BY date_bill
+    </select>
 
 </mapper>