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

“mitao”

2026-05-07 2182fb521701539d4327d18105c7e5b6e9fd42f6

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/OtherFallbackFactory.java

@@ -3,10 +3,15 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.other.api.domain.*;
import com.ruoyi.other.api.dto.ExchangeCodeBindDTO;
import com.ruoyi.other.api.dto.ExchangeCodeConsumeDTO;
import com.ruoyi.other.api.dto.ExchangeCodeUseRecordQuery;
import com.ruoyi.other.api.dto.TagListQueryDto;
import com.ruoyi.other.api.dto.UnitListQueryDto;
import com.ruoyi.other.api.feignClient.OtherClient;
import com.ruoyi.other.api.vo.CouponListVOVO;
import com.ruoyi.other.api.vo.ExchangeCodeBindResultVO;
import com.ruoyi.other.api.vo.ExchangeCodeConsumeResultVO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
@@ -108,6 +113,11 @@
            }

            @Override
            public R<List<Region>> listAllRegion() {
                return R.fail("远程调用获取所有region失败:"+throwable.getMessage());
            }

            @Override
            public R<List<TSystemConfiguration>> getTSystemConfiguration() {
                return R.fail("远程调用获取配置失败:"+throwable.getMessage());
            }
@@ -118,7 +128,7 @@
            }

            @Override
            public R<BigDecimal> getGreenElectricity(List<Integer> siteIds) {
            public R<BigDecimal> getGreenElectricity() {
                return R.fail("远程调用获取配置失败:"+throwable.getMessage());
            }

@@ -131,6 +141,40 @@
            public R<HashMap<String, Object>> getCarportData() {
                return R.fail("远程调用获取配置失败:"+throwable.getMessage());
            }

            @Override
            public R reset(String electricity) {
                return R.fail("远程调用获取配置失败:"+throwable.getMessage());
            }

            @Override
            public R<ExchangeCodeBindResultVO> bindExchangeCode(ExchangeCodeBindDTO dto, Long userId, String phone) {
                return R.fail("兑换码绑定失败:" + throwable.getMessage());
            }

            @Override
            public R<Map<Long, BigDecimal>> getExchangeCodeBalanceMap(List<Long> userIds) {
                return R.fail("查询兑换码余额失败:" + throwable.getMessage());
            }

            @Override
            public R<ExchangeCodeConsumeResultVO> consumeExchangeCodeBalance(ExchangeCodeConsumeDTO dto) {
                return R.fail("扣减兑换码余额失败:" + throwable.getMessage());
            }
            @Override
            public R<ExchangeCodeConsumeResultVO> refundExchangeCodeBalance(ExchangeCodeConsumeDTO dto) {
                return R.fail("退还兑换码余额失败:" + throwable.getMessage());
            }

            @Override
            public R<Page<TExchangeCodeUseRecord>> exchangeCodeUseRecordPage(ExchangeCodeUseRecordQuery query) {
                return R.fail("查询兑换码流水失败:" + throwable.getMessage());
            }

            @Override
            public R<TExchangeCodeUseRecord> exchangeCodeUseRecordDetail(Long id, Long userId) {
                return R.fail("查询兑换码流水详情失败:" + throwable.getMessage());
            }
        };
    }
}