From e863d3485d077c90988c81a756b37ef21cf4962e Mon Sep 17 00:00:00 2001 From: 44323 <443237572@qq.com> Date: 星期五, 17 十一月 2023 20:16:01 +0800 Subject: [PATCH] 后台bug修改 --- cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoodsAudit/TGoodsAudit.html | 2 +- cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java | 1 + cloud-server-management/src/main/webapp/static/modular/system/tGoodsAudit/tGoods.js | 7 +++++-- cloud-server-other/src/main/java/com/dsh/other/util/TaskUtil.java | 22 ++-------------------- 4 files changed, 9 insertions(+), 23 deletions(-) diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java index 7786c56..86ed776 100644 --- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java +++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java @@ -89,6 +89,7 @@ } @RequestMapping("/audit") public String audit(Model model) { + return PREFIX1 + "TGoodsAudit.html"; } diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoodsAudit/TGoodsAudit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoodsAudit/TGoodsAudit.html index a048919..8c5f2a7 100644 --- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoodsAudit/TGoodsAudit.html +++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoodsAudit/TGoodsAudit.html @@ -2,7 +2,7 @@ <div class="row"> <div class="col-sm-12"> <div class="ibox float-e-margins"> - <input hidden id="userType" value="${userType}"> + <div class="ibox-title"> <h5>门票审核管理</h5> </div> diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tGoodsAudit/tGoods.js b/cloud-server-management/src/main/webapp/static/modular/system/tGoodsAudit/tGoods.js index a7507c0..fdbeaef 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tGoodsAudit/tGoods.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tGoodsAudit/tGoods.js @@ -156,8 +156,11 @@ , btnAlign: 'c' //按钮居中 , shade: 0.5 //不显示遮罩 , yes: function () { - - + var state = TPointProducts.seItem.status; + if (state=="3"){ + Feng.error("当前门票不能再次审核!") + return; + } var OBJradio= $("input[name='type1']:checked").val(); console.log(OBJradio) let remark = $("#remark").val() diff --git a/cloud-server-other/src/main/java/com/dsh/other/util/TaskUtil.java b/cloud-server-other/src/main/java/com/dsh/other/util/TaskUtil.java index bcb6f74..f3154c3 100644 --- a/cloud-server-other/src/main/java/com/dsh/other/util/TaskUtil.java +++ b/cloud-server-other/src/main/java/com/dsh/other/util/TaskUtil.java @@ -68,7 +68,7 @@ // 预约场地后,待支付的订单 时间超过30分钟,不保留 @Scheduled(fixedRate = 60000) - public void taskMinute2(){ + public void taskMinute3(){ try { // 获取待核销状态的记录 List<SiteBooking> siteBookings = siteBookingMapper.selectList(new LambdaQueryWrapper<SiteBooking>() @@ -86,25 +86,7 @@ } } - @Scheduled(fixedRate = 60000) - public void taskMinute2(){ - try { - List<SiteBooking> siteBookings = siteBookingMapper.selectList(new LambdaQueryWrapper<SiteBooking>().eq(SiteBooking::getStatus, 0)); - for (SiteBooking siteBooking : siteBookings) { - long time = siteBooking.getInsertTime().getTime(); - long currentTime = System.currentTimeMillis(); - long timeDifference = currentTime - time; - long minutes = TimeUnit.MILLISECONDS.toMinutes(timeDifference); - if (minutes > 30) { - siteBooking.setStatus(5); - siteBookingMapper.updateById(siteBooking); - } - } - //定时修改赛事状态 - } catch (Exception e) { - e.printStackTrace(); - } - } + } -- Gitblit v1.7.1