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

gongzuming

2024-10-14 58a8acceb63d52377da4b837e859f2e03d2bce1b

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

@@ -46,6 +46,9 @@
    private UserPaymentV3Service paymentV3Service;

    @Autowired
    private UserPaymentSybService paymentSybService;

    @Autowired
    private OrderService orderService;

    @Autowired
@@ -114,10 +117,11 @@
                try {
                    LocalDateTime createdTime = o.getCreateTime().plusMinutes(5);
                    if (createdTime.isBefore(LocalDateTime.now())) {
                        boolean f = paymentV3Service.checkOrderStatus(o.getId());
                        /*boolean f = paymentV3Service.checkOrderStatus(o.getId());
                        if(!f){
                            paymentV3Service.cancelOrder(o.getId());
                        }
                        }*/
                        paymentSybService.cancelOrder(o.getId());
                    }
                } catch (Exception e) {
                    log.error(e.getMessage(), e);