From 2e43d137c7832e149f3df4145aa7fcca2153ef9c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 31 八月 2024 16:52:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java
index 4177dd3..ada6228 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java
@@ -1,9 +1,9 @@
package com.ruoyi.order.api.factory;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.order.api.feignClient.ChargingOrderClient;
+import com.ruoyi.common.core.dto.ExchangeDto;
import com.ruoyi.order.api.feignClient.OrderClient;
-import com.ruoyi.order.api.model.TChargingOrder;
+import com.ruoyi.order.api.model.TShoppingOrder;
import com.ruoyi.order.api.query.TActivityStatisticsQuery;
import com.ruoyi.order.api.vo.TActivityVO;
import org.slf4j.Logger;
@@ -41,6 +41,27 @@
}
@Override
+ public R<Long> getExchangeById(Integer goodsIds, Long userId,Integer goodType) {
+ return R.fail("根据订单数" + cause.getMessage());
+ }
+
+ @Override
+ public R<Long> exchangeCreate(ExchangeDto exchangeDto) {
+ return R.fail("创建订单" + cause.getMessage());
+ }
+
+ @Override
+ public R<TShoppingOrder> shopCreate(ExchangeDto exchangeDto) {
+ 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) {
return R.fail("查询活动费用统计失败:" + cause.getMessage());
}
--
Gitblit v1.7.1