Merge remote-tracking branch 'origin/master'

rentaiming

2024-06-21 0b007e7fe9ef41fbaa13507d2520a5e8e4faeb3c

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/listener/RedisListener.java

@@ -64,10 +64,10 @@
                        //自动结束团购任务
                        autoEndGroupPurchase(id);
                    } else if (DelayTaskEnum.AUCTION_GOODS_START_TASK.getCode().equals(operation)) {
                        // 自动开始团购任务
                        // 自动开始拍卖商品任务
                        autoStartAuctionGoods(id);
                    } else if (DelayTaskEnum.AUCTION_GOODS_END_TASK.getCode().equals(operation)) {
                        // 自动结束团购任务
                        // 自动结束拍卖商品任务
                        autoEndAuctionGoods(id);
                    }else if(DelayTaskEnum.ORDER_AUTOMATIC_CANCEL.getCode().equals(operation)){
                        //自动取消订单
@@ -84,11 +84,13 @@

    @Async
    public void autoEndAuctionGoods(Long id) {
        log.info("autoEndAuctionGoods scheduler task is running :{}", id);
        auctionClient.endAuctionGoods(id, SecurityConstants.INNER);
    }

    @Async
    public void autoStartAuctionGoods(Long id) {
        log.info("autoStartAuctionGoods scheduler task is running :{}", id);
        auctionClient.startAuctionGoods(id, SecurityConstants.INNER);
    }