From 2cbc012c77e0f98d2b42e9c24cd28a6e8b4c1d38 Mon Sep 17 00:00:00 2001 From: haotian <2421912570@qq.com> Date: Mon, 21 Apr 2025 14:46:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9--=E5=9C=A8=E4=BD=9C=E5=93=81?= =?UTF-8?q?=E7=BB=93=E6=9D=9F=E5=B1=95=E7=A4=BA=E5=89=8D=E4=B8=80=E5=A4=A9?= =?UTF-8?q?,=E8=AF=A5=E8=B5=84=E6=BA=90=E4=BD=8D=E5=B0=B1=E5=8F=AF?= =?UTF-8?q?=E8=B4=AD=E4=B9=B0--=E8=B5=84=E6=BA=90=E4=BD=8D=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=B8=BA=E9=97=B2=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backstage/SysSourceController.java | 3 +- .../backstage/daily/dailySysServer.java | 29 ++++++++++--------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysSourceController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysSourceController.java index e7793739..2937aa35 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysSourceController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysSourceController.java @@ -754,8 +754,7 @@ public class SysSourceController extends BaseController { return error("头像文件上传失败"); } //----------------------------------------------新版文件上传end----------------------------------------------- - System.out.println("sourceImagePath: "+sourceImagePath); - + // System.out.println("sourceImagePath: "+sourceImagePath); List sourceIdList = GsonUtils.fromJson(sourceStrList, List.class); 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 0d89570d..db1cb230 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 @@ -215,7 +215,7 @@ public class dailySysServer { // 这里应该每天12点后更新一次, @Scheduled(cron = "0 5 12 * * ?") @Transactional - @GetMapping("/dailySource") +// @GetMapping("/dailySource") public void updateDailySource(){ LocalDate now = LocalDate.now(); @@ -309,14 +309,12 @@ public class dailySysServer { else if(sysSource.getSourceStatus().equals("2") && endTime.equals(now)){ SysScenicDefault sysScenicDefault = sysScenicDefaultService.getScenicDefaultByScenicAndPart(sysSource.getScenic(), sysSource.getPart()); -// System.out.println("订单结束, 默认资源位价格数据: "+ sysSource.getSourceId()); + sysSource.setPrice(sysScenicDefault.getPrice()); sysSource.setSourceStatus("0"); sysSource.setWorkAddress(sysScenicDefault.getWorkAddress()); sysSource.setWorkId(0L); - - // 修改订单状态为2 已结束 Long orderId = sysSource.getOrderId(); if(orderId != null){ @@ -327,8 +325,6 @@ public class dailySysServer { } } - - } // 审核未通过--结束时间已经过去了---退款 @@ -361,12 +357,8 @@ public class dailySysServer { } - - - // 更新资源位信息 - sysSourceService.updateSysSource(sysSource); - // 24小时临期,结束资源位展示消息, 资源位结束时间-1 = now, 展示中才发到期提醒 + // 这时资源位应该恢复成闲置状态. if(endTime.minusDays(1).equals(now) && sysSource.getSourceStatus().equals("2")){ // 发送系统消息 //发送消息通知 @@ -383,16 +375,25 @@ public class dailySysServer { // 24小时临期消息 sysUserNotification.setType("7"); sysUserNotification.setStatus("0"); - + // 插入数据 userNotificationService.insertSysUserNotification(sysUserNotification); - - } } + // 修改资源位状态为闲置 + SysScenicDefault sysScenicDefault = sysScenicDefaultService.getScenicDefaultByScenicAndPart(sysSource.getScenic(), sysSource.getPart()); + + sysSource.setPrice(sysScenicDefault.getPrice()); + sysSource.setSourceStatus("0"); + sysSource.setWorkAddress(sysScenicDefault.getWorkAddress()); + sysSource.setWorkId(0L); + } + // 更新资源位信息 + sysSourceService.updateSysSource(sysSource); + } }