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

Pu Zhibing

2 天以前 49c5117caef44d1e817d2ef701529dfaf1443467

 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;

/**
@@ -40,6 +41,11 @@
            @Override
            public R<String> getShopSubMchId(Long shopId) {
                return R.fail("获取微信商户号失败:" + throwable.getMessage());
            }

            @Override
            public R<List<Long>> getShopIdsByUserIds(List<Long> userIds) {
                return R.fail("通过用户ids获取店铺ids失败:" + throwable.getMessage());
            }

            @Override
@@ -75,11 +81,6 @@
            @Override
            public R<List<MgtSimpleShopVo>> listShopSimpleVoByIds(MgtBaseBathDto mgtBaseBathDto) {
                return R.fail("获取商户列表失败:" + throwable.getMessage());
            }

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

            @Override
@@ -146,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();
            }
        };
    }
}