渠道用户数查询接口修改

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/ChannelTreeController.java

@@ -111,7 +111,7 @@ public class ChannelTreeController extends BaseApiController {
 			for(ChannelVO channelVO : list) {
 				if(null != channelVO && StringUtils.isNotBlank(channelVO.getChannelNo())) {
 					int siteCnt = channelService.getChannelSiteCnt(channelVO.getChannelNo());
-					int userCnt = channelUserRelService.getChannelUserCnt(channelVO.getChannelNo());
+					int userCnt = channelUserRelService.getChannelTotalUserCnt(channelVO.getChannelNo());
 					channelVO.setSiteCnt(siteCnt);
 					channelVO.setUserCnt(userCnt);
 					// 查询用户信息

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/SaleSiteController.java

@@ -67,7 +67,9 @@ public class SaleSiteController extends BaseApiController {
 		List<ChannelVO> list = new ArrayList<ChannelVO>();
 		startPage();
 		QueryWrapper<Channel> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("t1.parent_id", null!=channel && null != channel.getChannelId()?channel.getChannelId():0);
+		if(null!=channel && null != channel.getChannelId()) {
+			queryWrapper.eq("t1.parent_id", channel.getChannelId());
+		}
 		queryWrapper.eq("t1.level", 0);
 		queryWrapper.likeRight(null != channel && StringUtils.isNotBlank(channel.getMobile()), "t1.mobile", channel.getMobile());
 		queryWrapper.likeRight(null != channel && StringUtils.isNotBlank(channel.getName()), "t1.name", channel.getName());
@@ -75,13 +77,12 @@ public class SaleSiteController extends BaseApiController {
 		queryWrapper.eq(null != channel && null != channel.getCityId(), "t1.city_id", channel.getCityId());
 		queryWrapper.eq(null != channel && null != channel.getAreaId(), "t1.area_id", channel.getAreaId());
 		queryWrapper.orderByAsc("t1.channel_id");
-		queryWrapper.last("limit 50");
 		list = channelService.selectChannelVoList(queryWrapper);
 		if(null != list && list.size() > 0) {
 			for(ChannelVO channelVO : list) {
 				if(null != channelVO && StringUtils.isNotBlank(channelVO.getChannelNo())) {
 					int siteCnt = channelService.getChannelSiteCnt(channelVO.getChannelNo());
-					int userCnt = channelUserRelService.getChannelUserCnt(channelVO.getChannelNo());
+					int userCnt = channelUserRelService.getChannelTotalUserCnt(channelVO.getChannelNo());
 					channelVO.setSiteCnt(siteCnt);
 					channelVO.setUserCnt(userCnt);
 					// 查询用户信息

mp-admin/src/main/java/com/qs/mp/web/controller/api/channel/ChannelController.java

@@ -91,7 +91,7 @@ public class ChannelController extends BaseApiController {
 				for(ChannelVO channelVO : list) {
 					if(null != channelVO && StringUtils.isNotBlank(channelVO.getChannelNo())) {
 						int siteCnt = channelService.getChannelSiteCnt(channelVO.getChannelNo());
-						int userCnt = channelUserRelService.getChannelUserCnt(channelVO.getChannelNo());
+						int userCnt = channelUserRelService.getChannelTotalUserCnt(channelVO.getChannelNo());
 						channelVO.setSiteCnt(siteCnt);
 						channelVO.setUserCnt(userCnt);
 					}

mp-admin/src/test/java/com/qs/mp/service/ChannelServiceTest.java

@@ -44,7 +44,7 @@ public class ChannelServiceTest {
 			for(ChannelVO channelVO : list) {
 				if(null != channelVO && StringUtils.isNotBlank(channelVO.getChannelNo())) {
 					int siteCnt = channelService.getChannelSiteCnt(channelVO.getChannelNo());
-					int userCnt = channelUserRelService.getChannelUserCnt(channelVO.getChannelNo());
+					int userCnt = channelUserRelService.getChannelTotalUserCnt(channelVO.getChannelNo());
 					channelVO.setSiteCnt(siteCnt);
 					channelVO.setUserCnt(userCnt);
 				}

mp-service/src/main/java/com/qs/mp/channel/mapper/ChannelUserRelMapper.java

@@ -12,18 +12,18 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @describe 经销商的用户mapper类
  */
 public interface ChannelUserRelMapper extends BaseMapper<ChannelUserRel> {
-
-    /**
-     * 查询渠道及其子渠道经销商用户数总和
-     * @param channelNo
-     * @return
-     */
-    int getChannelUserCnt(@Param("channelNo") String channelNo);
     
+	/**
+	 * 根据渠道No查询渠道的用户数量
+	 * @param channelNo
+	 * @return
+	 */
+	int getChannelTotalUserCnt(@Param("channelNo") String channelNo);
+	
 	/**
 	 * 根据渠道No查询渠道指定时间内新增的用户数量
 	 * @param channelNo
 	 * @return
 	 */
-	int getChannelUserCnt(@Param("channelNo") String channelNo, @Param("days") int days);
+	int getChannelNewUserCnt(@Param("channelNo") String channelNo, @Param("days") int days);
 }

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

@@ -19,11 +19,11 @@ public interface IChannelUserRelService extends IService<ChannelUserRel> {
 	 * @param channelNo
 	 * @return
 	 */
-	int getChannelUserCnt(String channelNo);
+	int getChannelTotalUserCnt(String channelNo);
 	/**
 	 * 根据渠道No查询渠道指定时间内新增的用户数量
 	 * @param channelNo
 	 * @return
 	 */
-	int getChannelUserCnt(String channelNo, int days);
+	int getChannelNewUserCnt(String channelNo, int days);
 }

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

@@ -134,7 +134,7 @@ public class ChannelServiceImpl extends ServiceImpl<ChannelMapper, Channel> impl
 			channelOperData.setSaleAmt(channelCommission.getSaleAmt());
 			channelOperData.setCommAmt(channelCommission.getCommAmt());
 		}
-		int newUserCnt = channelUserRelService.getChannelUserCnt(channelNo, days);
+		int newUserCnt = channelUserRelService.getChannelNewUserCnt(channelNo, days);
 		channelOperData.setNewUserCnt(newUserCnt);
 		return channelOperData;
 	}

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

@@ -18,12 +18,12 @@ import org.springframework.stereotype.Service;
 public class ChannelUserRelServiceImpl extends ServiceImpl<ChannelUserRelMapper, ChannelUserRel> implements IChannelUserRelService {
 
 	@Override
-	public int getChannelUserCnt(String channelNo) {
-		return getBaseMapper().getChannelUserCnt(channelNo);
+	public int getChannelTotalUserCnt(String channelNo) {
+		return getBaseMapper().getChannelTotalUserCnt(channelNo);
 	}
 
 	@Override
-	public int getChannelUserCnt(String channelNo, int days) {
-		return getBaseMapper().getChannelUserCnt(channelNo, days == 1?0: (~(days - 1)));
+	public int getChannelNewUserCnt(String channelNo, int days) {
+		return getBaseMapper().getChannelNewUserCnt(channelNo, days == 1?0: (~(days - 1)));
 	}
 }

mp-service/src/main/resources/mapper/channel/ChannelUserRelMapper.xml

@@ -17,7 +17,15 @@
     </sql>
     
     <!-- 查询渠道及其子渠道经销商用户数总和 -->
-    <select id="getChannelUserCnt" resultType="integer">
+    <select id="getChannelTotalUserCnt" resultType="integer">
+        select count(t1.user_id) as userCnt 
+		from mp_channel_user_rel t1
+		left join mp_channel t2 on t1.channel_id = t2.channel_id
+		where t2.channel_no like concat(#{channelNo}, '.%')
+    </select>
+    
+    <!-- 根据渠道No查询渠道指定时间内新增的用户数量 -->
+    <select id="getChannelNewUserCnt" resultType="integer">
         select count(t1.user_id) as userCnt 
 		from mp_channel_user_rel t1
 		left join mp_channel t2 on t1.channel_id = t2.channel_id