diff --git a/m2pool-api/api-system/src/main/java/com/m2pool/system/api/RemoteUserService.java b/m2pool-api/api-system/src/main/java/com/m2pool/system/api/RemoteUserService.java index 7bda21f..14f8d49 100644 --- a/m2pool-api/api-system/src/main/java/com/m2pool/system/api/RemoteUserService.java +++ b/m2pool-api/api-system/src/main/java/com/m2pool/system/api/RemoteUserService.java @@ -90,6 +90,6 @@ public interface RemoteUserService { * @return 结果 */ @PostMapping("/user/getCSList") - public List getCSList(); + public R> getCSList(); } diff --git a/m2pool-api/api-system/src/main/java/com/m2pool/system/api/factory/RemoteUserFallbackFactory.java b/m2pool-api/api-system/src/main/java/com/m2pool/system/api/factory/RemoteUserFallbackFactory.java index 68b90b8..67c9048 100644 --- a/m2pool-api/api-system/src/main/java/com/m2pool/system/api/factory/RemoteUserFallbackFactory.java +++ b/m2pool-api/api-system/src/main/java/com/m2pool/system/api/factory/RemoteUserFallbackFactory.java @@ -10,6 +10,8 @@ import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.stereotype.Component; +import java.util.List; + /** * @Description 用户服务降级处理 * @Date 2024/6/11 15:48 @@ -62,6 +64,10 @@ public class RemoteUserFallbackFactory implements FallbackFactory> getCSList() { + return R.fail("客服列表获取失败:" + cause.getMessage()); + } }; } diff --git a/m2pool-modules/m2pool-system/src/main/java/com/m2pool/system/controller/SysUserController.java b/m2pool-modules/m2pool-system/src/main/java/com/m2pool/system/controller/SysUserController.java index fa0506e..b6f7f9a 100644 --- a/m2pool-modules/m2pool-system/src/main/java/com/m2pool/system/controller/SysUserController.java +++ b/m2pool-modules/m2pool-system/src/main/java/com/m2pool/system/controller/SysUserController.java @@ -232,6 +232,9 @@ public class SysUserController extends BaseController { public R> getCSList() { List list = userService.getCSList(); + if(StringUtils.isNull(list)){ + return R.fail("未能获取到客服列表"); + } return R.success(list); } } diff --git a/m2pool-modules/m2pool-system/src/main/java/com/m2pool/system/mapper/SysUserMapper.java b/m2pool-modules/m2pool-system/src/main/java/com/m2pool/system/mapper/SysUserMapper.java index b13d17f..f08aa1a 100644 --- a/m2pool-modules/m2pool-system/src/main/java/com/m2pool/system/mapper/SysUserMapper.java +++ b/m2pool-modules/m2pool-system/src/main/java/com/m2pool/system/mapper/SysUserMapper.java @@ -129,4 +129,10 @@ public interface SysUserMapper { public GoogleInfo getGoogleInfoByEmail(@Param("email") String email); + /** + * 获取客服列表 + * + * @return 用户信息集合信息 + */ + public List getCSList(); } diff --git a/m2pool-modules/m2pool-system/src/main/java/com/m2pool/system/service/impl/SysUserServiceImpl.java b/m2pool-modules/m2pool-system/src/main/java/com/m2pool/system/service/impl/SysUserServiceImpl.java index f45b0f8..bcc9ed7 100644 --- a/m2pool-modules/m2pool-system/src/main/java/com/m2pool/system/service/impl/SysUserServiceImpl.java +++ b/m2pool-modules/m2pool-system/src/main/java/com/m2pool/system/service/impl/SysUserServiceImpl.java @@ -411,7 +411,9 @@ public class SysUserServiceImpl implements SysUserService { @Override public List getCSList() { - return null; + List list = userMapper.getCSList(); + + return list; } /** diff --git a/m2pool-modules/m2pool-system/src/main/resources/mapper/system/SysUserMapper.xml b/m2pool-modules/m2pool-system/src/main/resources/mapper/system/SysUserMapper.xml index 5e924d5..0d07e40 100644 --- a/m2pool-modules/m2pool-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/m2pool-modules/m2pool-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -133,6 +133,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" user_name = #{email} limit 1 + insert into sys_user(