Merge remote-tracking branch 'origin/master'

puzhibing

2024-09-26 8b94c462ae127795cfa4a0495c723ca9b7041e10

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java

@@ -69,6 +69,11 @@
                return R.fail("支付回调:" + cause.getMessage());
            }

            @Override
            public R vipCallBack(String code, String outTradeNo) {
                return R.fail("会员订单回调失败:" + cause.getMessage());
            }


            @Override
            public R<TActivityVO> activityStatistics(TActivityStatisticsQuery dto) {