Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-16 e7f23c16b1d1c6553a0442f3d0d129248d267670

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserClientFallbackFactory.java

@@ -6,8 +6,10 @@
import com.ruoyi.common.core.domain.R;
import lombok.extern.slf4j.Slf4j;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;

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

/**
@@ -41,6 +43,7 @@
            throw new RuntimeException("获取优惠券数量失败");
         }

         @GetMapping("/appUserShop/shop/{userId}")
         @Override
         public R<List<AppUserShop>> getAppUserShop(Long userId) {
            log.error("获取用户门店信息失败：{}", cause.getMessage());
@@ -69,8 +72,33 @@
            log.error("获取直推会员数失败：{}", cause.getMessage());
            throw new RuntimeException("获取直推会员数失败");
         }
			
         @Override
         public R<List<AppUser>> getAppUserByName(String name) {
            return R.fail("根据用户名称模糊搜索用户列表失败：" + cause.getMessage());
         }
			
         @Override
         public R<List<AppUser>> getAppUserByPhone(String phone) {
            return R.fail("根据用户电话模糊搜索用户列表失败：" + cause.getMessage());
         }
			
			
         @Override
            public R<Void> addAppUserShop(AppUserShop appUserShop) {
                return R.fail("添加失败");
            }

         @Override
         public R<AppUser> getAppUserByPhone1(String phone) {
            return R.fail("通过手机号查询用户失败");
         }

         @Override
         public List<AppUser> listByIds(List<Long> list) {
            log.error("获取用户失败: "+cause.getMessage());
            return Collections.emptyList();
         }
      };
   }
}