m2pool 获取客服列表接口添加

Signed-off-by: jxy_duyi <2826961034@qq.com>

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<SysUser> getCSList();
+    public R<List<SysUser>> getCSList();
 
 }

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<RemoteUserServ
                 return R.fail("谷歌验证器校验失败:" + cause.getMessage());
             }
 
+            @Override
+            public R<List<SysUser>> getCSList() {
+                return R.fail("客服列表获取失败:" + cause.getMessage());
+            }
 
         };
     }

m2pool-modules/m2pool-system/src/main/java/com/m2pool/system/controller/SysUserController.java

@@ -232,6 +232,9 @@ public class SysUserController extends BaseController {
     public R<List<SysUser>> getCSList()
     {
         List<SysUser> list = userService.getCSList();
+        if(StringUtils.isNull(list)){
+            return R.fail("未能获取到客服列表");
+        }
         return R.success(list);
     }
 }

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<SysUser> getCSList();
 }

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<SysUser> getCSList() {
 
-        return null;
+        List<SysUser> list = userMapper.getCSList();
+
+        return list;
     }
 
     /**

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
     </select>
+    <select id="getCSList" resultType="com.m2pool.system.api.entity.SysUser">
+        select
+            u.user_id userId,
+            u.user_name userName,
+            u.email email
+        from
+            sys_user u
+            left join sys_user_role ur on u.user_id = ur.user_id
+        where
+            u.status=0
+            and ur.role_id=3
+    </select>
 
     <insert id="insertUser" parameterType="com.m2pool.system.api.entity.SysUser" useGeneratedKeys="true" keyProperty="userId">
         insert into sys_user(