Merge remote-tracking branch 'origin/master'

zhibing.pu

2024-08-28 948cb5be3f62683c7edd8180d1b2cac0c426d0c9

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

@@ -55,6 +55,11 @@
                return R.fail("订单创建" + cause.getMessage());
            }

            @Override
            public R callBack(String code, String outTradeNo) {
                return R.fail("支付回调:" + cause.getMessage());
            }


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