From caa2b51bb4133f5a2e59eac242e744fb57f864a0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 10 九月 2024 13:01:44 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 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 04ea275..61b14b5 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,13 +1,14 @@
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.TExchangeOrder;
+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 com.ruoyi.order.api.vo.ExchangeDto;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
@@ -43,7 +44,7 @@
}
@Override
- public R<Long> getExchangeById(Integer goodsIds, Long userId) {
+ public R<Long> getExchangeById(Integer goodsIds, Long userId,Integer goodType) {
return R.fail("根据订单数" + cause.getMessage());
}
@@ -52,12 +53,33 @@
return R.fail("创建订单" + cause.getMessage());
}
+ @Override
+ public R<Long> addVipOrder(TVipOrder vipOrder) {
+ return null;
+ }
+
+
+ @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());
}
+ @Override
+ public R<AccountListVO> accountBillList(ChargingListQuery dto) {
+ return R.fail("账户结算账单导出失败:" + cause.getMessage());
+ }
+
};
}
--
Gitblit v1.7.1