Merge remote-tracking branch 'origin/master'

mitao

2024-06-18 fd97cde3d994a3aa6898ba862cd20d0c081012c3

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

@@ -5,14 +5,11 @@
import com.ruoyi.common.core.enums.BondStatusEnum;
import com.ruoyi.system.api.domain.Order;
import com.ruoyi.system.api.domain.OrderAuctionBond;
import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomDTO;
import com.ruoyi.system.api.domain.dto.OrderAuctionBondDTO;
import com.ruoyi.system.api.domain.dto.OrderDTO;
import com.ruoyi.system.api.domain.dto.OrderUpdDTO;
import com.ruoyi.system.api.domain.dto.RefundDTO;
import com.ruoyi.system.api.domain.dto.*;
import com.ruoyi.system.api.domain.vo.OrderVO;
import com.ruoyi.system.api.domain.vo.PayInfoVO;
import com.ruoyi.system.api.feignClient.OrderClient;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import org.springframework.cloud.openfeign.FallbackFactory;
@@ -34,6 +31,16 @@
            }

            @Override
            public R<Order> getOrderOne(OrderDTO orderDTO, String source) {
                return R.fail("获取订单失败:" + cause.getMessage());
            }

            @Override
            public R<Order> getOrderOne1(OrderDTO orderDTO, String source) {
                return R.fail("获取订单失败:" + cause.getMessage());
            }

            @Override
            public R<Boolean> getOrderAuctionBond(OrderAuctionBondDTO orderAuctionBondDTO,
                    String source) {
                return R.fail("查询拍卖订单佣金失败:" + cause.getMessage());
@@ -51,6 +58,16 @@
            @Override
            public R<List<Order>> getOrderByGroupPurchaseId(Long id, String source) {
                return R.fail("根据团购商品id获取订单列表失败:" + cause.getMessage());
            }

            @Override
            public R<Order> getOrderByGroupPurchaseMemberId(HomeGoodsSkuDTO homeGoodsSkuDTO, String source) {
                return R.fail("根据团购商品用户获取订单:" + cause.getMessage());
            }

            @Override
            public R<List<OrderVO>> getOrderByGroupPurchaseMemberList(HomeGoodsSkuDTO homeGoodsSkuDTO, String source) {
                return R.fail("根据团购商品用户d获取订单列表失败:" + cause.getMessage());
            }

            @Override
@@ -82,7 +99,7 @@

            @Override
            public R<?> updateOrderAuctionBondStatus(List<Long> ids,
                    BondStatusEnum bondStatusEnum) {
                    BondStatusEnum bondStatusEnum, String source) {
                return R.fail("批量更新保证金订单状态失败" + cause.getMessage());
            }

@@ -97,14 +114,14 @@
            }

            @Override
            public R<?> UpdateBond(BondDTO BondVO, String source) {
                return R.fail("修改保证金支付状态失败" + cause.getMessage());
            public R<List<Order>> getOrderByCouponIds(Collection<Long> couponIds, String source) {
                return R.fail("根据优惠券id列表获取订单列表失败" + cause.getMessage());
            }

            @Override
            public R<List<OrderAuctionBond>> getAuctionGoodsOrderAuctionBondList(AuctionGoodsListDTO auctionGoodsListDTO, String source) {
                return R.fail("普通拍卖获取保证金失败" + cause.getMessage());
            }

        };

    }