Merge remote-tracking branch 'origin/2.0' into 2.0

huliguo

2 天以前 a966dafb8877552267a94fe8c544c5ea72cf5650

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

@@ -14,6 +14,7 @@
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.RequestBody;

import java.util.Collections;
import java.util.List;

/**
@@ -83,11 +84,6 @@
            }

            @Override
            public R<MgtBulletinBoardVo> boardShopTotal() {
                return null;
            }

            @Override
            public R<List<Long>> listShopIdByPlTotal(MgtBasePlatformDto mgtBasePlatformDto) {
                return R.fail("获取商户列表失败:" + throwable.getMessage());
            }
@@ -151,6 +147,21 @@
            public R<List<Shop>> listShopByIds(List<String> ids) {
                return R.fail("获取商户列表失败:" + throwable.getMessage());
            }

            @Override
            public R<MgtBulletinBoardVo> boardShopTotal(BoardMemberTotalDto boardMemberTotalDto) {
                return R.fail(throwable.getMessage());
            }

            @Override
            public List<Shop> getShopBySysUserIds(BoardMemberTotalDto boardMemberTotalDto) {
                return null;
            }

            @Override
            public List<Shop> getFranchiseeIdsBYDealerId(Long shopId) {
                return Collections.emptyList();
            }
        };
    }
}