From 81606bed082dd128c489bb0c10e6b642f1226655 Mon Sep 17 00:00:00 2001
From: zhangli <123879394@qq.com>
Date: Mon, 4 Aug 2025 23:58:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E4=BA=BA=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/sczx/order/controller/ClientOrderController.java    | 2 +-
 src/main/java/com/sczx/order/convert/OrderConvert.java      | 2 ++
 src/main/java/com/sczx/order/dto/OrderDetailDTO.java        | 6 ++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/sczx/order/controller/ClientOrderController.java b/src/main/java/com/sczx/order/controller/ClientOrderController.java
index 9124d71..a8a48b4 100644
--- a/src/main/java/com/sczx/order/controller/ClientOrderController.java
+++ b/src/main/java/com/sczx/order/controller/ClientOrderController.java
@@ -33,7 +33,7 @@ public class ClientOrderController {
     public Result<IPage<OrderSimpleDTO>> pageCustOrder(@RequestParam(name = "pageNo", required = false, defaultValue = "1") Integer pageNo,
                                                         @RequestParam(name = "pageSize", required = false, defaultValue = "10") Integer pageSize,
                                                         @RequestBody OrderQueryReq orderQueryReq){
-        return Result.ok(orderService.pageStoreOrder(pageNo, pageSize, orderQueryReq));
+        return Result.ok(orderService.pageCustOrder(pageNo, pageSize, orderQueryReq));
     }
 
     @ApiOperation(value = "生成租车订单")
diff --git a/src/main/java/com/sczx/order/convert/OrderConvert.java b/src/main/java/com/sczx/order/convert/OrderConvert.java
index d8bfe1e..de86802 100644
--- a/src/main/java/com/sczx/order/convert/OrderConvert.java
+++ b/src/main/java/com/sczx/order/convert/OrderConvert.java
@@ -56,6 +56,8 @@ public interface OrderConvert {
             @Mapping(source = "orderMainPO.customerName", target = "customerName"),
             @Mapping(source = "orderMainPO.rentalType", target = "rentalType"),
             @Mapping(source = "orderMainPO.rentalPrice", target = "rentalPrice"),
+            @Mapping(source = "orderMainPO.overdueType", target = "overdueType"),
+            @Mapping(source = "orderMainPO.overdueFee", target = "overdueFee"),
             @Mapping(source = "orderMainPO.depositPrice", target = "depositPrice"),
             @Mapping(source = "orderMainPO.firstOrderTime", target = "firstOrderTime"),
             @Mapping(source = "orderMainPO.pickCarTime", target = "pickCarTime"),
diff --git a/src/main/java/com/sczx/order/dto/OrderDetailDTO.java b/src/main/java/com/sczx/order/dto/OrderDetailDTO.java
index ec94c10..48f4a93 100644
--- a/src/main/java/com/sczx/order/dto/OrderDetailDTO.java
+++ b/src/main/java/com/sczx/order/dto/OrderDetailDTO.java
@@ -64,6 +64,12 @@ public class OrderDetailDTO {
     @ApiModelProperty("租车价格(元)")
     private BigDecimal rentalPrice;
 
+    @ApiModelProperty("逾期金额(元)")
+    private BigDecimal overdueFee;
+
+    @ApiModelProperty("逾期计费类型(按日计费/按月计费)")
+    private String overdueType;
+
     @ApiModelProperty("押金价格(元)")
     private BigDecimal depositPrice;