'1'

jkt-admin/src/main/java/com/miaxis/pc/controller/vip/VipCodeController.java

@@ -6,9 +6,12 @@ import java.util.List;
 import java.util.Arrays;
 import java.util.Random;
 
+import com.miaxis.common.core.domain.entity.SysRole;
 import com.miaxis.common.core.domain.entity.SysUser;
+import com.miaxis.common.core.domain.vo.AgentVO;
 import com.miaxis.common.exception.CustomException;
 import com.miaxis.common.utils.SecurityUtils;
+import com.miaxis.system.service.ISysRoleService;
 import com.miaxis.system.service.ISysUserService;
 import com.miaxis.vip.dto.QueryVipCodeListDTO;
 import io.swagger.annotations.*;
@@ -48,6 +51,9 @@ public class VipCodeController extends BaseController{
     @Autowired
     private ISysUserService userService;
 
+    @Autowired
+    private ISysRoleService roleService;
+
     /**
      * 查询激活码列表
      */
@@ -66,6 +72,22 @@ public class VipCodeController extends BaseController{
         return toResponsePageInfo(list);
     }
 
+
+    /**
+     * 查询代理商列表
+     */
+    @PreAuthorize("@ss.hasPermi('vip:code:list')")
+    @GetMapping("/agentList")
+    @ApiOperation("查询代理商列表")
+    public Response<List<AgentVO>> agentList(String agentName){
+        SysRole sysRole = new SysRole();
+        sysRole.setRoleKey("agent");
+        List<SysRole> sysRoles = roleService.selectRoleList(sysRole);
+        Long roleId = sysRoles.get(0).getRoleId();
+        List<AgentVO> sysUsersList =  userService.getAgentList(roleId,agentName);
+        return Response.success(sysUsersList);
+    }
+
     /**
      * 导出激活码列表
      */

jkt-common/src/main/java/com/miaxis/common/core/domain/vo/AgentVO.java

@@ -0,0 +1,28 @@
+package com.miaxis.common.core.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@Data
+public class AgentVO {
+    private static final long serialVersionUID = 1L;
+
+
+    @TableId(value = "user_id")
+    @ApiModelProperty(value = "主键")
+    private Long userId;
+
+
+
+    @TableField("user_name")
+    @ApiModelProperty(value = "用户名称")
+    private String userName;
+
+
+
+
+
+}

jkt-system/src/main/java/com/miaxis/system/mapper/SysUserMapper.java

@@ -2,6 +2,7 @@ package com.miaxis.system.mapper;
 
 import com.miaxis.common.core.domain.entity.SysUser;
 import com.miaxis.common.core.domain.entity.UserInfo;
+import com.miaxis.common.core.domain.vo.AgentVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -116,4 +117,6 @@ public interface SysUserMapper
     UserInfo getStudentByName(String username);
 
     void saveUserInfo(UserInfo userInfo);
+
+    List<AgentVO> getAgentList(@Param("roleId")Long roleId, @Param("userName")String userName);
 }

jkt-system/src/main/java/com/miaxis/system/service/ISysUserService.java

@@ -2,6 +2,7 @@ package com.miaxis.system.service;
 
 import com.miaxis.common.core.domain.entity.SysUser;
 import com.miaxis.common.core.domain.entity.UserInfo;
+import com.miaxis.common.core.domain.vo.AgentVO;
 
 import java.util.List;
 
@@ -176,4 +177,6 @@ public interface ISysUserService
 
 
     void saveUserInfo(UserInfo userInfo);
+
+    List<AgentVO> getAgentList(Long roleId, String agentName);
 }

jkt-system/src/main/java/com/miaxis/system/service/impl/SysUserServiceImpl.java

@@ -5,6 +5,7 @@ import com.miaxis.common.constant.UserConstants;
 import com.miaxis.common.core.domain.entity.SysRole;
 import com.miaxis.common.core.domain.entity.SysUser;
 import com.miaxis.common.core.domain.entity.UserInfo;
+import com.miaxis.common.core.domain.vo.AgentVO;
 import com.miaxis.common.exception.CustomException;
 import com.miaxis.common.utils.SecurityUtils;
 import com.miaxis.common.utils.StringUtils;
@@ -462,4 +463,9 @@ public class SysUserServiceImpl implements ISysUserService
     public void saveUserInfo(UserInfo userInfo) {
         userMapper.saveUserInfo(userInfo);
     }
+
+    @Override
+    public List<AgentVO> getAgentList(Long roleId, String agentName) {
+        return userMapper.getAgentList(roleId,agentName);
+    }
 }

jkt-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -105,6 +105,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		insert into user_info (head_image,nick_name,openid) values (#{headImage},#{nickName},#{openid})
 	</insert>
 
+	<select id="getAgentList" resultType="com.miaxis.common.core.domain.vo.AgentVO">
+		  select t.user_id,t.user_name from sys_user t where
+		  1 =1
+		<if test="userName != null and userName != ''">
+			AND user_name like concat('%', #{userName}, '%')
+		</if>
+		and exists (select 1 from sys_user_role where role_id =#{roleId} and user_id = t.user_id)
+
+	</select>
 
 
 	<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">