From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 54 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java
index f3518bb..5dd115b 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java
@@ -6,6 +6,7 @@
import com.ruoyi.system.api.domain.Order;
import com.ruoyi.system.api.domain.OrderAuctionBond;
import com.ruoyi.system.api.domain.dto.AuctionGoodsListDTO;
+import com.ruoyi.system.api.domain.dto.BondReturnDTO;
import com.ruoyi.system.api.domain.dto.HomeGoodsSkuDTO;
import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomBondDTO;
import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomDTO;
@@ -48,6 +49,11 @@
}
@Override
+ public R<Order> getOrderOne2(OrderDTO orderDTO, String source) {
+ return null;
+ }
+
+ @Override
public R<Boolean> getOrderAuctionBond(OrderAuctionBondDTO orderAuctionBondDTO,
String source) {
return R.fail("查询拍卖订单佣金失败:" + cause.getMessage());
@@ -73,8 +79,23 @@
}
@Override
+ public R<Order> getOrderByGroupPurchaseMemberId1(HomeGoodsSkuDTO homeGoodsSkuDTO, String source) {
+ return null;
+ }
+
+ @Override
+ public R<Order> getOrderByGroupPurchaseMemberId2(HomeGoodsSkuDTO homeGoodsSkuDTO, String source) {
+ return null;
+ }
+
+ @Override
public R<List<OrderVO>> getOrderByGroupPurchaseMemberList(HomeGoodsSkuDTO homeGoodsSkuDTO, String source) {
return R.fail("根据团购商品用户d获取订单列表失败:" + cause.getMessage());
+ }
+
+ @Override
+ public R<List<OrderVO>> getOrderByGroupPurchaseMemberList1(HomeGoodsSkuDTO homeGoodsSkuDTO, String source) {
+ return null;
}
@Override
@@ -95,6 +116,11 @@
@Override
public R<Map<String, Object>> refund(List<RefundDTO> refundDTOS, String source) {
return R.fail("批量退款失败" + cause.getMessage());
+ }
+
+ @Override
+ public R refund1(RefundDTO refundDTOS, String source) {
+ return null;
}
@Override
@@ -130,9 +156,36 @@
}
@Override
- public R<?> returnBondByAuctionGoodsId(Long id, String source) {
+ public R<?> returnBondByAuctionGoodsId(BondReturnDTO bondReturnDTO, String source) {
return R.fail("普通拍卖退保证金失败" + cause.getMessage());
}
+
+ @Override
+ public R<?> autoCancelOrder(Long id, String source) {
+ return R.fail("自动取消订单失败" + cause.getMessage());
+ }
+
+ @Override
+ public R<List<Order>> getOrderListByMubres(List<String> mubres, String source) {
+ return R.fail("根据团购唯一表示获取订单列表失败" + cause.getMessage());
+ }
+
+ @Override
+ public R<?> updateOrderStatusByMubres(List<String> formedGroupMubres, String source) {
+ return R.fail("修改订单展示状态失败" + cause.getMessage());
+ }
+
+ @Override
+ public R<?> updateOrderStatusByMubres1(String formedGroupMubres, String source) {
+ return null;
+ }
+
+ @Override
+ public R<List<Order>> updateOrderStatusByMubres2(String formedGroupMubres, String source) {
+ return null;
+ }
+
+
};
}
--
Gitblit v1.7.1