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 74630450..f83769bb 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
@@ -597,17 +597,17 @@ public class AppSystemController extends BaseController {
             }
 
         }
-        // 新的签名不为空
-        if(!StringUtils.isEmpty(signature)){
-            UserInfo userInfo = userInfoService.selectUserInfoByUserId(getUserId());
-            if(!signature.equals(userInfo.getSignature())){
-                boolean f2 = userInfoService.updateSignature(username, signature);
-                if(!f2){
-                    return error("更新签名失败");
-                }
+        // 新签名
+
+        UserInfo userInfo = userInfoService.selectUserInfoByUserId(getUserId());
+        if(!signature.equals(userInfo.getSignature())) {
+            boolean f2 = userInfoService.updateSignature(username, signature);
+            if (!f2) {
+                return error("更新签名失败");
             }
         }
 
+
         if (!avatarImage.isEmpty()){
             //-----------------------------------------新版文件上传------------------------------------------------------
             String avatarFilePath = "";
@@ -2192,6 +2192,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();
+            sysOrderPayBackDto.setRemainTime(Math.max(ChronoUnit.SECONDS.between(now, sysOrderPayBackDto.getEndTime()), 0));
             return success(sysOrderPayBackDto);
         }
         return error("获取订单详情失败");
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/SysOrderPayBackDto.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/SysOrderPayBackDto.java
index 6c88212d..b8d7f2e7 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/SysOrderPayBackDto.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/SysOrderPayBackDto.java
@@ -8,11 +8,13 @@ public class SysOrderPayBackDto {
     private String orderInfoId;
     private LocalDateTime createTime;
     private LocalDateTime payTime;
+    private LocalDateTime endTime;
     private Long money;
     private String arLocation;
     private String part;
     private int c_x;
     private int c_y;
+    private Long remainTime;
 
     public Long getOrderId() {
         return orderId;
@@ -46,6 +48,14 @@ public class SysOrderPayBackDto {
         this.payTime = payTime;
     }
 
+    public LocalDateTime getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(LocalDateTime endTime) {
+        this.endTime = endTime;
+    }
+
     public String getArLocation() {
         return arLocation;
     }
@@ -86,5 +96,13 @@ public class SysOrderPayBackDto {
         this.money = money;
     }
 
+    public Long getRemainTime() {
+        return remainTime;
+    }
+
+    public void setRemainTime(Long remainTime) {
+        this.remainTime = remainTime;
+    }
+
 
 }
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysOrderMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysOrderMapper.xml
index 56f6c174..baa586ed 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysOrderMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysOrderMapper.xml
@@ -70,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap id="SysOrderPayBackDtoResult" type="SysOrderPayBackDto">
         <result property="orderId" column="order_id"/>
         <result property="createTime" column="create_time"/>
+        <result property="endTime" column="end_time"/>
         <result property="orderInfoId" column="order_info_id"/>
         <result property="money" column="money"/>
         <result property="part" column="part"/>
@@ -138,7 +139,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where status = '1' and create_time = #{date} and delete_flag = '0'
     </select>
     <select id="getSysOrderPayBackDto" resultMap="SysOrderPayBackDtoResult">
-        select sys_order.order_id, create_time, order_info_id, money, part, c_x, c_y
+        select sys_order.order_id, create_time, sys_order.end_time, order_info_id, money, part, c_x, c_y
         from sys_order
         left join sys_source
         on sys_order.source_id = sys_source.source_id