Merge branch 'master2'

kongdeqiang

2024-04-22 7bc78d8f70a4d11e46f8bd640228804a3dd0dc68

 src/main/java/com/boying/job/PayResult2Scheduled.java

@@ -37,7 +37,7 @@

    Boolean taskFlag = false;

    @Scheduled(cron = "0/2 * * * * ?")
    //@Scheduled(cron = "0/2 * * * * ?")
    public void execute() throws Exception {
        if(taskFlag == true){
            System.out.println("正在运行，强制退出-------》");
@@ -49,6 +49,7 @@
                .ne(Ticket::getStatus,3)
                .eq(Ticket::getPayStatus,0)
                .ne(Ticket::getMoney,0)
                .ne(Ticket::getPayCode,"")
                .isNotNull(Ticket::getPayCode)
                .orderByDesc(Ticket::getCreateTime);
        List<Ticket> list = ticketService.list(wrapper);