Merge branch 'dev' of 113.31.163.91:quanshu/mp-server into dev

mp-admin/.gitignore

@@ -0,0 +1 @@
+/bin/

mp-service/src/main/java/com/qs/mp/channel/service/IChannelService.java

@@ -1,6 +1,10 @@
 package com.qs.mp.channel.service;
 
 import com.qs.mp.channel.domain.Channel;
+import com.qs.mp.channel.domain.vo.ChannelVO;
+
+import java.util.List;
+
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -13,10 +17,19 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IChannelService extends IService<Channel> {
 
-  /**
-   * 根据用户ID查询渠道
-   * @param userId
-   * @return
-   */
-  Channel getChannelByUserId(Long userId);
+	/**
+	 * 获取我的下级渠道列表信息，支持翻页
+	 * 
+	 * @param channel
+	 * @return
+	 */
+	public List<ChannelVO> selectVoList(Channel channel);
+
+	/**
+	 * 根据用户ID查询渠道
+	 * 
+	 * @param userId
+	 * @return
+	 */
+	Channel getChannelByUserId(Long userId);
 }

mp-service/src/main/java/com/qs/mp/channel/service/impl/ChannelServiceImpl.java

@@ -2,9 +2,13 @@ package com.qs.mp.channel.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.qs.mp.channel.domain.Channel;
+import com.qs.mp.channel.domain.vo.ChannelVO;
 import com.qs.mp.channel.mapper.ChannelMapper;
 import com.qs.mp.channel.service.IChannelService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import java.util.List;
+
 import org.springframework.stereotype.Service;
 
 /**
@@ -18,8 +22,14 @@ import org.springframework.stereotype.Service;
 @Service
 public class ChannelServiceImpl extends ServiceImpl<ChannelMapper, Channel> implements IChannelService {
 
-  @Override
-  public Channel getChannelByUserId(Long userId) {
-    return getBaseMapper().selectOne(new LambdaQueryWrapper<Channel>().eq(Channel::getUserId, userId));
-  }
+	@Override
+	public List<ChannelVO> selectVoList(Channel channel) {
+
+		return null;
+	}
+
+	@Override
+	public Channel getChannelByUserId(Long userId) {
+		return getBaseMapper().selectOne(new LambdaQueryWrapper<Channel>().eq(Channel::getUserId, userId));
+	}
 }