From 09f319bc88cf80514491b19ce0290b41f9a1ba3a Mon Sep 17 00:00:00 2001 From: jiangqs <jiangqs> Date: 星期六, 26 八月 2023 14:36:10 +0800 Subject: [PATCH] Merge branch 'master' of ssh://120.76.84.145:20202/java/HongRuiTang into master --- ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteShopFallbackFactory.java | 46 ++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 42 insertions(+), 4 deletions(-) diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteShopFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteShopFallbackFactory.java index 1139eed..c2996e4 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteShopFallbackFactory.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteShopFallbackFactory.java @@ -1,10 +1,8 @@ package com.ruoyi.system.api.factory; import com.ruoyi.common.core.domain.R; -import com.ruoyi.system.api.domain.dto.MgtBaseBathDto; -import com.ruoyi.system.api.domain.dto.MgtBasePlatformDto; -import com.ruoyi.system.api.domain.dto.MgtShopIdByCodeDto; -import com.ruoyi.system.api.domain.dto.ShopTotalChangeDto; +import com.ruoyi.system.api.domain.dto.*; +import com.ruoyi.system.api.domain.poji.shop.ShopProportionVo; import com.ruoyi.system.api.domain.vo.*; import com.ruoyi.system.api.model.QwH5LoginVo; import com.ruoyi.system.api.model.QwUserDetailDto; @@ -36,6 +34,11 @@ @Override public R<Shop> getShop(Long shopId) { return R.fail("获取商户失败:" + throwable.getMessage()); + } + + @Override + public R<String> getShopSubMchId(Long shopId) { + return R.fail("获取微信商户号失败:" + throwable.getMessage()); } @Override @@ -87,6 +90,41 @@ public R<MemberTaskSimpleVo> getLastMemberTask(Long userId) { return R.fail("获取最近会员任务失败:" + throwable.getMessage()); } + + @Override + public R<List<Long>> listShopIdByShopId(Long shopId) { + return R.fail("获取商户列表失败:" + throwable.getMessage()); + } + + @Override + public R<Integer> getUnReplaySuggestVo() { + return null; + } + + @Override + public R<Integer> getShopMarketingStatus(Long shopId) { + return null; + } + + @Override + public R<ShopRelUserVo> getShopByBelongUserId(Long userId) { + return R.fail("获取商户失败:" + throwable.getMessage()); + } + + @Override + public R editMgtShopStaff(MgtShopStaffEditDto mgtShopStaffEditDto) { + return R.fail("修改员工失败:" + throwable.getMessage()); + } + + @Override + public R<ShopProportionVo> getShopProportion(Long shopId) { + return R.fail("获取商户分成信息失败:" + throwable.getMessage()); + } + + @Override + public R<List<Long>> listShopIdByCityCode(List<String> cityCodes) { + return R.fail("获取商户列表失败:" + throwable.getMessage()); + } }; } } -- Gitblit v1.7.1