diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/daily/dailySysServer.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/daily/dailySysServer.java
index 03fb0470..34107c2d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/daily/dailySysServer.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/daily/dailySysServer.java
@@ -72,6 +72,9 @@ public class dailySysServer {
     @Autowired
     private ISysUserWorkCountService sysUserWorkCountService;
 
+    @Autowired
+    private ISysUserNotificationService userNotificationService;
+
 
 
     //计数当前系统用户数量并且插入daily_sys表(日期是昨天)
@@ -538,13 +541,50 @@ public class dailySysServer {
                     // System.out.println("订单结束, 默认资源位价格数据: "+ sysScenicDefault.getPrice());
                     sysSource.setPrice(sysScenicDefault.getPrice());
                     sysSource.setSourceStatus("0");
-                    sysSource.setWorkAddress(sysSource.getWorkAddress());
+                    sysSource.setWorkAddress(sysScenicDefault.getWorkAddress());
+
+                }
+
+                // 审核未通过--结束时间已经过去了---退款
+                else if(sysSource.getSourceStatus().equals("1") && (sysSource.getEndTime().isBefore(now) || sysSource.getEndTime().isEqual(now))){
+                    //-----------------退款  还没写------------------------
+
+                    // 退款时发送消息
+                    //-----------------退款end--------------------------
+
+                    SysScenicDefault sysScenicDefault = sysScenicDefaultService.getScenicDefaultByScenicAndPart(sysSource.getScenic(), sysSource.getPart());
+                    // System.out.println("订单结束, 默认资源位价格数据: "+ sysScenicDefault.getPrice());
+                    sysSource.setPrice(sysScenicDefault.getPrice());
+                    sysSource.setSourceStatus("0");
+                    sysSource.setWorkAddress(sysScenicDefault.getWorkAddress());
 
                 }
 
                 // 更新资源位信息
                 sysSourceService.updateSysSource(sysSource);
 
+                // 24小时临期,结束资源位展示消息, 资源位结束时间-1 = now
+                if(sysSource.getEndTime().minusDays(1).equals(now)){
+                    // 发送系统消息
+                    //发送消息通知
+                    Long workId = sysSource.getWorkId();
+                    // 查询用户id
+                    Long receiveUserId = userWorkService.selectUserWorkByWorkId(workId).getUserId();
+                    if (receiveUserId != null){
+                        SysUserNotification sysUserNotification = new SysUserNotification();
+                        sysUserNotification.setUserId(receiveUserId);
+                        sysUserNotification.setSenderId(0L);
+                        // 24小时临期消息
+                        sysUserNotification.setType("7");
+                        sysUserNotification.setStatus("0");
+
+                        userNotificationService.insertSysUserNotification(sysUserNotification);
+
+
+                    }
+
+                }
+
             }
 
         }