diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java
index f231faca..135f8c90 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java
@@ -1283,6 +1283,40 @@ public class AppSystemController extends BaseController {
                 orderInfoDto.setOrderId(orderListDto.getOrderId());
             }
 
+
+            //------------------------------------------设置订单剩余时间---------------------------------------------------------------------
+            LocalDateTime now = LocalDateTime.now();
+            Duration duration = Duration.between(now, orderListDto.getEndTime());
+
+
+            // 分解单位（同上）
+            long days = duration.toDays();
+            long hours = duration.toHours() % 24;
+            long minutes = duration.toMinutes() % 60;
+            long seconds = duration.getSeconds() % 60;
+
+            String s = "剩余";
+            if (days > 0){
+                s = s + days + "天";
+            }
+            if (hours > 0){
+                s = s + hours + "小时";
+            }
+            if (minutes > 0){
+                s = s + minutes + "分";
+            }
+            if  (seconds > 0){
+                s = s + seconds + "秒";
+            }
+
+            if (s.equals("剩余")){
+                s = "订单已结束展示";
+            }
+
+
+            orderListDto.setRemainTimeString(s);
+            //----------------------------------------------------------------设置订单剩余时间end--------------------------------------------------------------
+
             orderListDto.setOrderInfoList(orderInfoList);
 
 
@@ -2201,37 +2235,8 @@ public class AppSystemController extends BaseController {
             String c_x = String.format("%02d", sysOrderPayBackDto.getC_x());
             String c_y = String.format("%02d", sysOrderPayBackDto.getC_y());
             sysOrderPayBackDto.setArLocation(sysOrderPayBackDto.getPart()+c_x+c_y);
-            LocalDateTime now = LocalDateTime.now();
-            Duration duration = Duration.between(now, sysOrderPayBackDto.getEndTime());
 
 
-            // 分解单位（同上）
-            long days = duration.toDays();
-            long hours = duration.toHours() % 24;
-            long minutes = duration.toMinutes() % 60;
-            long seconds = duration.getSeconds() % 60;
-
-            String s = "剩余";
-            if (days > 0){
-                s = s + days + "天";
-            }
-            if (hours > 0){
-                s = s + hours + "小时";
-            }
-            if (minutes > 0){
-                s = s + minutes + "分";
-            }
-            if  (seconds > 0){
-                s = s + seconds + "秒";
-            }
-
-            if (s.equals("剩余")){
-                s = "订单已结束展示";
-            }
-
-
-            sysOrderPayBackDto.setRemainTimeString(s);
-
             return success(sysOrderPayBackDto);
         }
         return error("获取订单详情失败");
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/OrderListDto.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/OrderListDto.java
index 982077aa..1fbf1b50 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/OrderListDto.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/OrderListDto.java
@@ -1,5 +1,6 @@
 package com.ruoyi.system.domain.dto;
 
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 
@@ -16,7 +17,7 @@ public class OrderListDto {
     private Date createTime;
 
     private Date startTime;
-    private Date endTime;
+    private LocalDateTime endTime;
 
     private String orderInfoId;
 
@@ -34,6 +35,9 @@ public class OrderListDto {
 
     private String avatar;
 
+    // 剩余时间
+    private String remainTimeString;
+
     private List<OrderInfoDto> orderInfoList;
 
 
@@ -62,12 +66,12 @@ public class OrderListDto {
         this.startTime = startTime;
     }
 
-    public Date getEndTime() {
+    public LocalDateTime getEndTime() {
         return endTime;
     }
 
 
-    public void setEndTime(Date endTime) {
+    public void setEndTime(LocalDateTime endTime) {
         this.endTime = endTime;
     }
 
@@ -167,6 +171,14 @@ public class OrderListDto {
 		this.workStatus = workStatus;
 	}
 
+    public String getRemainTimeString() {
+		return remainTimeString;
+	}
+
+    public void setRemainTimeString(String remainTimeString) {
+		this.remainTimeString = remainTimeString;
+	}
+
 
 
 }