Merge remote-tracking branch 'origin/master'

luodangjia

2024-09-10 ce19680b98669f8b4e66b2ce82fe0dcebe178445

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

@@ -3,9 +3,11 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.dto.ExchangeDto;
import com.ruoyi.order.api.feignClient.OrderClient;
import com.ruoyi.order.api.model.ChargingListQuery;
import com.ruoyi.order.api.model.TShoppingOrder;
import com.ruoyi.order.api.model.TVipOrder;
import com.ruoyi.order.api.query.TActivityStatisticsQuery;
import com.ruoyi.order.api.vo.AccountListVO;
import com.ruoyi.order.api.vo.TActivityVO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -73,6 +75,11 @@
                return R.fail("查询活动费用统计失败:" + cause.getMessage());
            }

            @Override
            public R<AccountListVO> accountBillList(ChargingListQuery dto) {
                return R.fail("账户结算账单导出失败:" + cause.getMessage());
            }


        };
    }