统计都去掉了多余的关联mp_channel的条件

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

@@ -62,14 +62,14 @@ public class IndexMgrController extends BaseApiController {
 		queryWrapper.ge(null != queryParam && null != queryParam.getStartTime(), "t1.created_time", queryParam.getStartTime());
 		queryWrapper.le(null != queryParam && null != queryParam.getEndTime(), "t1.created_time", queryParam.getEndTime());
 		queryWrapper.gt("t1.`status`", 0);
-		Long channelId = SecurityUtils.getLoginUser().getChannelId();
-		if(null != channelId && 0 != channelId) {
-			Channel channel = channelService.getById(channelId);
-			if(null!=channel && StringUtils.isNotBlank(channel.getChannelNo())) {
-				queryWrapper.and(wrapper -> wrapper.likeRight("t2.channel_no", channel.getChannelNo())
-						.or().eq("t2.channel_no", channel.getChannelNo()));
-			}
-		}
+//		Long channelId = SecurityUtils.getLoginUser().getChannelId();
+//		if(null != channelId && 0 != channelId) {
+//			Channel channel = channelService.getById(channelId);
+//			if(null!=channel && StringUtils.isNotBlank(channel.getChannelNo())) {
+//				queryWrapper.and(wrapper -> wrapper.likeRight("t2.channel_no", channel.getChannelNo())
+//						.or().eq("t2.channel_no", channel.getChannelNo()));
+//			}
+//		}
 	
 		list = userTicketOrderService.selectIndexPayAmtList(queryWrapper);
 		return  AjaxResult.success(getPayAmtList(list, queryParam));
@@ -185,14 +185,14 @@ public class IndexMgrController extends BaseApiController {
 		queryWrapper.ge(null != queryParam && null != queryParam.getStartTime(), "t1.created_time", queryParam.getStartTime());
 		queryWrapper.le(null != queryParam && null != queryParam.getEndTime(), "t1.created_time", queryParam.getEndTime());
 		queryWrapper.gt("t1.`status`", 0);
-		Long channelId = SecurityUtils.getLoginUser().getChannelId();
-		if(null != channelId && 0 != channelId) {
-			Channel channel = channelService.getById(channelId);
-			if(null!=channel && StringUtils.isNotBlank(channel.getChannelNo())) {
-				queryWrapper.and(wrapper -> wrapper.likeRight("t2.channel_no", channel.getChannelNo())
-						.or().eq("t2.channel_no", channel.getChannelNo()));
-			}
-		}
+//		Long channelId = SecurityUtils.getLoginUser().getChannelId();
+//		if(null != channelId && 0 != channelId) {
+//			Channel channel = channelService.getById(channelId);
+//			if(null!=channel && StringUtils.isNotBlank(channel.getChannelNo())) {
+//				queryWrapper.and(wrapper -> wrapper.likeRight("t2.channel_no", channel.getChannelNo())
+//						.or().eq("t2.channel_no", channel.getChannelNo()));
+//			}
+//		}
 	
 		list = userTicketOrderService.selectIndexPayUserCntList(queryWrapper);
 		return  AjaxResult.success(getPayUserList(list, queryParam));
@@ -333,14 +333,14 @@ public class IndexMgrController extends BaseApiController {
 		queryWrapper.ge(null != queryParam && null != queryParam.getStartTime(), "t1.created_time", queryParam.getStartTime());
 		queryWrapper.le(null != queryParam && null != queryParam.getEndTime(), "t1.created_time", queryParam.getEndTime());
 		queryWrapper.eq("t1.`level`", 0);
-		Long channelId = SecurityUtils.getLoginUser().getChannelId();
-		if(null != channelId && 0 != channelId) {
-			Channel channel = channelService.getById(channelId);
-			if(null!=channel && StringUtils.isNotBlank(channel.getChannelNo())) {
-				queryWrapper.and(wrapper -> wrapper.likeRight("t2.channel_no", channel.getChannelNo())
-						.or().eq("t2.channel_no", channel.getChannelNo()));
-			}
-		}
+//		Long channelId = SecurityUtils.getLoginUser().getChannelId();
+//		if(null != channelId && 0 != channelId) {
+//			Channel channel = channelService.getById(channelId);
+//			if(null!=channel && StringUtils.isNotBlank(channel.getChannelNo())) {
+//				queryWrapper.and(wrapper -> wrapper.likeRight("t2.channel_no", channel.getChannelNo())
+//						.or().eq("t2.channel_no", channel.getChannelNo()));
+//			}
+//		}
 	
 		list = channelService.selectIndexSiteIncreaseList(queryWrapper);
 		return  AjaxResult.success(getSiteIncreaseList(list, queryParam));
@@ -468,17 +468,17 @@ public class IndexMgrController extends BaseApiController {
 		siteQueryWrapper.le(null != queryParam && null != queryParam.getEndTime(), "t1.created_time", queryParam.getEndTime());
 		siteQueryWrapper.eq("t1.`level`", 0);
 		
-		Long channelId = SecurityUtils.getLoginUser().getChannelId();
-		if(null != channelId && 0 != channelId) {
-			Channel channel = channelService.getById(channelId);
-			if(null!=channel && StringUtils.isNotBlank(channel.getChannelNo())) {
-				queryWrapper.and(wrapper -> wrapper.likeRight("t2.channel_no", channel.getChannelNo())
-						.or().eq("t2.channel_no", channel.getChannelNo()));
-				
-				siteQueryWrapper.and(wrapper -> wrapper.likeRight("t2.channel_no", channel.getChannelNo())
-						.or().eq("t2.channel_no", channel.getChannelNo()));
-			}
-		}
+//		Long channelId = SecurityUtils.getLoginUser().getChannelId();
+//		if(null != channelId && 0 != channelId) {
+//			Channel channel = channelService.getById(channelId);
+//			if(null!=channel && StringUtils.isNotBlank(channel.getChannelNo())) {
+//				queryWrapper.and(wrapper -> wrapper.likeRight("t2.channel_no", channel.getChannelNo())
+//						.or().eq("t2.channel_no", channel.getChannelNo()));
+//				
+//				siteQueryWrapper.and(wrapper -> wrapper.likeRight("t2.channel_no", channel.getChannelNo())
+//						.or().eq("t2.channel_no", channel.getChannelNo()));
+//			}
+//		}
 	
 		list = userTicketOrderService.selectIndexDailyInfoList(queryWrapper);
 	
@@ -566,15 +566,15 @@ public class IndexMgrController extends BaseApiController {
 		queryWrapper.le(null != queryParam && null != queryParam.getEndTime(), "t1.created_time", queryParam.getEndTime());
 		queryWrapper.gt("t1.`status`", 0);
 		
-		Long channelId = SecurityUtils.getLoginUser().getChannelId();
-		if(null != channelId && 0 != channelId) {
-			Channel channel = channelService.getById(channelId);
-			if(null!=channel && StringUtils.isNotBlank(channel.getChannelNo())) {
-				queryWrapper.and(wrapper -> wrapper.likeRight("t2.channel_no", channel.getChannelNo())
-						.or().eq("t2.channel_no", channel.getChannelNo()));
-				
-			}
-		}
+//		Long channelId = SecurityUtils.getLoginUser().getChannelId();
+//		if(null != channelId && 0 != channelId) {
+//			Channel channel = channelService.getById(channelId);
+//			if(null!=channel && StringUtils.isNotBlank(channel.getChannelNo())) {
+//				queryWrapper.and(wrapper -> wrapper.likeRight("t2.channel_no", channel.getChannelNo())
+//						.or().eq("t2.channel_no", channel.getChannelNo()));
+//				
+//			}
+//		}
 	
 		list = userTicketOrderService.selectIndexTicketBoxTop(queryWrapper);
 		List<Map<String,Object>> mapList = new ArrayList<>();
@@ -609,15 +609,15 @@ public class IndexMgrController extends BaseApiController {
 		queryWrapper.le(null != queryParam && null != queryParam.getEndTime(), "t1.created_time", queryParam.getEndTime());
 		queryWrapper.gt("t1.`status`", 0);
 		
-		Long channelId = SecurityUtils.getLoginUser().getChannelId();
-		if(null != channelId && 0 != channelId) {
-			Channel channel = channelService.getById(channelId);
-			if(null!=channel && StringUtils.isNotBlank(channel.getChannelNo())) {
-				queryWrapper.and(wrapper -> wrapper.likeRight("t2.channel_no", channel.getChannelNo())
-						.or().eq("t2.channel_no", channel.getChannelNo()));
-				
-			}
-		}
+//		Long channelId = SecurityUtils.getLoginUser().getChannelId();
+//		if(null != channelId && 0 != channelId) {
+//			Channel channel = channelService.getById(channelId);
+//			if(null!=channel && StringUtils.isNotBlank(channel.getChannelNo())) {
+//				queryWrapper.and(wrapper -> wrapper.likeRight("t2.channel_no", channel.getChannelNo())
+//						.or().eq("t2.channel_no", channel.getChannelNo()));
+//				
+//			}
+//		}
 	
 		list = userTicketOrderService.selectIndexTicketSiteTop(queryWrapper);
 		List<Map<String,Object>> mapList = new ArrayList<>();

mp-service/src/main/resources/mapper/user/UserTicketOrderMapper.xml

@@ -35,7 +35,6 @@
           DATE_FORMAT(t1.created_time, '%Y%m%d') AS time,
           SUM(t1.pay_amt) AS payAmt
 	     from `mp_user_ticket_order` t1
-	left join mp_channel t2 on t1.channel_id = t2.channel_id
 		${ew.customSqlSegment}
 		GROUP BY time
 	</select>
@@ -46,7 +45,6 @@
           DATE_FORMAT(t1.created_time, '%Y%m%d') AS time,
           COUNT(DISTINCT t1.user_id) AS payUserCnt
 	     from `mp_user_ticket_order` t1
-	left join mp_channel t2 on t1.channel_id = t2.channel_id
 		${ew.customSqlSegment}
 		GROUP BY time
 	</select>
@@ -59,7 +57,6 @@
           SUM(IFNULL(t1.ticket_num,0)) AS 'ticketNum',
           COUNT(DISTINCT t1.user_id) AS payUserCnt
 	     from `mp_user_ticket_order` t1
-	left join mp_channel t2 on t1.channel_id = t2.channel_id
 		${ew.customSqlSegment}
 		GROUP BY time
 	</select>
@@ -73,7 +70,6 @@
           t1.box_id,
           SUM(t1.pay_amt) AS pay_amt
 	     from `mp_user_ticket_order` t1
-	left join mp_channel t2 on t1.channel_id = t2.channel_id
 		${ew.customSqlSegment}
 		GROUP BY t1.box_id
 		ORDER BY pay_amt DESC limit 10 ) a
@@ -88,7 +84,6 @@
           t1.channel_id,
           SUM(t1.pay_amt) AS pay_amt
 	     from `mp_user_ticket_order` t1
-	left join mp_channel t2 on t1.channel_id = t2.channel_id
 		${ew.customSqlSegment}
 		GROUP BY t1.channel_id
 		ORDER BY pay_amt DESC limit 10 ) a