From 7aba645529a88ec4fa632b2e0080fcf61cfe4d2f Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期五, 08 九月 2023 08:36:59 +0800
Subject: [PATCH] 修改
---
src/main/java/com/boying/job/DaPingScheduled.java | 14 +++++++-------
src/main/java/com/boying/job/PayResult2Scheduled.java | 1 +
src/main/java/com/boying/controller/TicketBlackController.java | 4 +++-
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/boying/controller/TicketBlackController.java b/src/main/java/com/boying/controller/TicketBlackController.java
index 15a5e72..c71476c 100644
--- a/src/main/java/com/boying/controller/TicketBlackController.java
+++ b/src/main/java/com/boying/controller/TicketBlackController.java
@@ -46,7 +46,6 @@
public Object findPage(Page page, TicketBlack ticket){
QueryWrapper<TicketBlack> wrapper = new QueryWrapper<>();
wrapper.lambda()
- .eq(TicketBlack::getBlackType,0)
.like(StringUtils.isNotBlank(ticket.getCarNo()),TicketBlack::getCarNo,ticket.getCarNo())
.eq(ticket.getIsActive() != null,TicketBlack::getIsActive,ticket.getIsActive())
.orderByDesc(TicketBlack::getCreateTime);
@@ -85,6 +84,9 @@
public Object delete(Long id){
TicketBlack ticket =ticketBlackService.getById(id);
if(ticket!=null){
+ if(ticket.getViolationCount() >0 ){
+ return R.failed("璇峰厛瑙ｅ喅杩濈珷");
+ }
ticketBlackService.removeById(ticket);
return R.ok("鎿嶄綔鎴愬姛");
}
diff --git a/src/main/java/com/boying/job/DaPingScheduled.java b/src/main/java/com/boying/job/DaPingScheduled.java
index 86c51c1..512abef 100644
--- a/src/main/java/com/boying/job/DaPingScheduled.java
+++ b/src/main/java/com/boying/job/DaPingScheduled.java
@@ -32,13 +32,13 @@
@Scheduled(cron = "0 0/40 * * * ?")
public void execute() throws IOException {
System.out.println("寮�濮嬪畾鏃朵换鍔�-------銆�");
- List<TicketBlack> list = ticketBlackService.updateType();
- if(list.size() > 0){
- for(TicketBlack t:list){
- t.setBlackType(1);
- ticketBlackService.saveOrUpdate(t);
- }
- }
+// List<TicketBlack> list = ticketBlackService.updateType();
+// if(list.size() > 0){
+// for(TicketBlack t:list){
+// t.setBlackType(1);
+// ticketBlackService.saveOrUpdate(t);
+// }
+// }
Statistic statistic = null;
List<Statistic> all = statisticService.list();
if(all.size()>0){
diff --git a/src/main/java/com/boying/job/PayResult2Scheduled.java b/src/main/java/com/boying/job/PayResult2Scheduled.java
index 3adb776..60a6397 100644
--- a/src/main/java/com/boying/job/PayResult2Scheduled.java
+++ b/src/main/java/com/boying/job/PayResult2Scheduled.java
@@ -46,6 +46,7 @@
taskFlag = true;
QueryWrapper<Ticket> wrapper = new QueryWrapper<>();
wrapper.lambda()
+ .ne(Ticket::getStatus,3)
.eq(Ticket::getPayStatus,0)
.ne(Ticket::getMoney,0)
.isNotNull(Ticket::getPayCode)
--
Gitblit v1.9.1