Merge remote-tracking branch 'origin/master-v2' into master-v2

陶杰

2024-09-02 6d943721ed2c41de272450143d6e204e7c4bc446

 src/main/java/com/mzl/flower/schedule/ScheduleService.java

@@ -133,7 +133,12 @@
    @Scheduled(cron = "1 20 0/1 * * ?")
    public void autoReceive() {
        log.info("自动收货开始：" + DateFormatUtils.format(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
        orderService.autoReceive();
        List<Order> ls = orderService.autoReceive();
        if(ls != null && ls.size() > 0){
            for(Order o : ls){
                orderService.processAfterReceive(o);
            }
        }
        log.info("自动收货结束：" + DateFormatUtils.format(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
    }

@@ -164,6 +169,7 @@
            for(Transfer t : ls){
                try {
                    paymentV3Service.checkTransferStatus(t);
                    settlementService.updateSettlementStatus(t.getId());
                } catch (Exception e) {
                    log.error(e.getMessage(), e);
                }