From c4664502dfdaffff555b532e65b51a57ac8b29c2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 16 十月 2024 17:51:32 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 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..ab55bc6 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,10 +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.ExchangeBackDto;
+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.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;
@@ -41,10 +45,47 @@
}
@Override
+ public R<Long> getExchangeById(Integer goodsIds, Long userId,Integer goodType) {
+ return R.fail("根据订单数" + cause.getMessage());
+ }
+
+ @Override
+ public R<ExchangeBackDto> exchangeCreate(ExchangeDto exchangeDto) {
+ 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 vipCallBack(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