Merge remote-tracking branch 'origin/dev' into dev

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

@@ -57,9 +57,9 @@ public class IndexMgrController extends BaseApiController {
 	@PostMapping("/pay/amt")
 	// @PreAuthorize("@ss.hasPermi('business:channel:list')")
 	public AjaxResult listPayAmtData(@RequestBody IndexQueryParam indeQueryParam) {
-		
+
 		IndexQueryParam queryParam = getQueryParam(indeQueryParam);
-		
+
 		List<IndexVO> list = new ArrayList<IndexVO>();
 		QueryWrapper<UserTicketOrder> queryWrapper = new QueryWrapper<>();
 		queryWrapper.ge(null != queryParam && null != queryParam.getStartTime(), "t1.created_time", queryParam.getStartTime());
@@ -89,7 +89,7 @@ public class IndexMgrController extends BaseApiController {
 
 		return  AjaxResult.success(getPayAmtList(list, queryParam));
 	}
-	
+
 	private List<Map<String,Object>> getPayAmtList(List<IndexVO> list, IndexQueryParam queryParam){
 		List<Map<String,Object>> mapList = new ArrayList<>();
 		if(null != queryParam && queryParam.getLevel().equals("month")) {  // 月粒度
@@ -129,7 +129,7 @@ public class IndexMgrController extends BaseApiController {
 					if(null != list && list.size() > 0) {
 						if(StringUtils.isNotBlank(day)) {
 							for(IndexVO indexVo : list) {
-								if(null != indexVo 
+								if(null != indexVo
 										&& null != indexVo.getPayAmt()
 										&& StringUtils.isNotBlank(indexVo.getTime())
 										&& indexVo.getTime().equals(day)) {
@@ -147,15 +147,15 @@ public class IndexMgrController extends BaseApiController {
 			}
 		}
 		return mapList;
-	} 
-	
-	
+	}
+
+
 	private int getWeekPayAmt(List<String> dayList, List<IndexVO> list) {
 		BigDecimal payAmt = new BigDecimal(0);
 		if(null != list && list.size() > 0
 				&& null != dayList && dayList.size() > 0) {
 			for(IndexVO indexVo : list) {
-				if(null != indexVo 
+				if(null != indexVo
 						&& null != indexVo.getPayAmt()
 						&& StringUtils.isNotBlank(indexVo.getTime())
 						&& dayList.contains(indexVo.getTime())) {
@@ -166,13 +166,13 @@ public class IndexMgrController extends BaseApiController {
 		}
 		return 0;
 	}
-	
+
 	private int getMonthPayAmt(String month, List<IndexVO> list) {
 		BigDecimal payAmt = new BigDecimal(0);
 		if(null != list && list.size() > 0
 				&& StringUtils.isNotBlank(month)) {
 			for(IndexVO indexVo : list) {
-				if(null != indexVo 
+				if(null != indexVo
 						&& null != indexVo.getPayAmt()
 						&& StringUtils.isNotBlank(indexVo.getTime())
 						&& indexVo.getTime().indexOf(month) >= 0) {
@@ -183,8 +183,8 @@ public class IndexMgrController extends BaseApiController {
 		}
 		return 0;
 	}
-	
-	
+
+
 	/**
 	 * 查询统计交易用户数
 	 * @return
@@ -192,9 +192,9 @@ public class IndexMgrController extends BaseApiController {
 	@PostMapping("/pay/user")
 	// @PreAuthorize("@ss.hasPermi('business:channel:list')")
 	public AjaxResult listPayUserData(@RequestBody IndexQueryParam indeQueryParam) {
-		
+
 		IndexQueryParam queryParam = getQueryParam(indeQueryParam);
-		
+
 		List<IndexVO> list = new ArrayList<IndexVO>();
 		QueryWrapper<UserTicketOrder> queryWrapper = new QueryWrapper<>();
 		queryWrapper.ge(null != queryParam && null != queryParam.getStartTime(), "t1.created_time", queryParam.getStartTime());
@@ -208,11 +208,11 @@ public class IndexMgrController extends BaseApiController {
 //						.or().eq("t2.channel_no", channel.getChannelNo()));
 //			}
 //		}
-	
+
 		list = userTicketOrderService.selectIndexPayUserCntList(queryWrapper);
 		return  AjaxResult.success(getPayUserList(list, queryParam));
 	}
-	
+
 	private List<Map<String,Object>> getPayUserList(List<IndexVO> list, IndexQueryParam queryParam){
 		List<Map<String,Object>> mapList = new ArrayList<>();
 		if(null != queryParam && queryParam.getLevel().equals("month")) {  // 月粒度
@@ -252,7 +252,7 @@ public class IndexMgrController extends BaseApiController {
 					if(null != list && list.size() > 0) {
 						if(StringUtils.isNotBlank(day)) {
 							for(IndexVO indexVo : list) {
-								if(null != indexVo 
+								if(null != indexVo
 										&& null != indexVo.getPayUserCnt()
 										&& StringUtils.isNotBlank(indexVo.getTime())
 										&& indexVo.getTime().equals(day)) {
@@ -270,15 +270,15 @@ public class IndexMgrController extends BaseApiController {
 			}
 		}
 		return mapList;
-	} 
-	
-	
+	}
+
+
 	private int getWeekPayUser(List<String> dayList, List<IndexVO> list) {
 		int payUserCnt = 0;
 		if(null != list && list.size() > 0
 				&& null != dayList && dayList.size() > 0) {
 			for(IndexVO indexVo : list) {
-				if(null != indexVo 
+				if(null != indexVo
 						&& null != indexVo.getPayUserCnt()
 						&& StringUtils.isNotBlank(indexVo.getTime())
 						&& dayList.contains(indexVo.getTime())) {
@@ -289,13 +289,13 @@ public class IndexMgrController extends BaseApiController {
 		}
 		return 0;
 	}
-	
+
 	private int getMonthPayUser(String month, List<IndexVO> list) {
 		int payUserCnt = 0;
 		if(null != list && list.size() > 0
 				&& StringUtils.isNotBlank(month)) {
 			for(IndexVO indexVo : list) {
-				if(null != indexVo 
+				if(null != indexVo
 						&& null != indexVo.getPayUserCnt()
 						&& StringUtils.isNotBlank(indexVo.getTime())
 						&& indexVo.getTime().indexOf(month) >= 0) {
@@ -306,8 +306,8 @@ public class IndexMgrController extends BaseApiController {
 		}
 		return 0;
 	}
-	
-	
+
+
 	/**
 	 * 初始化查询参数
 	 * @param indeQueryParam
@@ -331,8 +331,8 @@ public class IndexMgrController extends BaseApiController {
 		}
 		return queryParam;
 	}
-	
-	
+
+
 	/**
 	 * 查询统计新增经销商数量
 	 * @return
@@ -340,9 +340,9 @@ public class IndexMgrController extends BaseApiController {
 	@PostMapping("/site/increase")
 	// @PreAuthorize("@ss.hasPermi('business:channel:list')")
 	public AjaxResult listSiteIncreaseData(@RequestBody IndexQueryParam indeQueryParam) {
-		
+
 		IndexQueryParam queryParam = getQueryParam(indeQueryParam);
-		
+
 		List<IndexVO> list = new ArrayList<IndexVO>();
 		QueryWrapper<Channel> queryWrapper = new QueryWrapper<>();
 		queryWrapper.ge(null != queryParam && null != queryParam.getStartTime(), "t1.created_time", queryParam.getStartTime());
@@ -356,11 +356,11 @@ public class IndexMgrController extends BaseApiController {
 //						.or().eq("t2.channel_no", channel.getChannelNo()));
 //			}
 //		}
-	
+
 		list = channelService.selectIndexSiteIncreaseList(queryWrapper);
 		return  AjaxResult.success(getSiteIncreaseList(list, queryParam));
 	}
-	
+
 	private List<Map<String,Object>> getSiteIncreaseList(List<IndexVO> list, IndexQueryParam queryParam){
 		List<Map<String,Object>> mapList = new ArrayList<>();
 		if(null != queryParam && queryParam.getLevel().equals("month")) {  // 月粒度
@@ -400,7 +400,7 @@ public class IndexMgrController extends BaseApiController {
 					if(null != list && list.size() > 0) {
 						if(StringUtils.isNotBlank(day)) {
 							for(IndexVO indexVo : list) {
-								if(null != indexVo 
+								if(null != indexVo
 										&& null != indexVo.getNewSiteCnt()
 										&& StringUtils.isNotBlank(indexVo.getTime())
 										&& indexVo.getTime().equals(day)) {
@@ -410,7 +410,7 @@ public class IndexMgrController extends BaseApiController {
 							}
 						}
 					}
-					
+
 					Map<String,Object> map = new HashMap<String,Object>();
 					map.put("x", day);
 					map.put("y", newSiteCnt);
@@ -419,15 +419,15 @@ public class IndexMgrController extends BaseApiController {
 			}
 		}
 		return mapList;
-	} 
-	
-	
+	}
+
+
 	private int getWeekSiteIncrease(List<String> dayList, List<IndexVO> list) {
 		int newSiteCnt = 0;
 		if(null != list && list.size() > 0
 				&& null != dayList && dayList.size() > 0) {
 			for(IndexVO indexVo : list) {
-				if(null != indexVo 
+				if(null != indexVo
 						&& null != indexVo.getNewSiteCnt()
 						&& StringUtils.isNotBlank(indexVo.getTime())
 						&& dayList.contains(indexVo.getTime())) {
@@ -438,13 +438,13 @@ public class IndexMgrController extends BaseApiController {
 		}
 		return 0;
 	}
-	
+
 	private int getMonthSiteIncrease(String month, List<IndexVO> list) {
 		int newSiteCnt = 0;
 		if(null != list && list.size() > 0
 				&& StringUtils.isNotBlank(month)) {
 			for(IndexVO indexVo : list) {
-				if(null != indexVo 
+				if(null != indexVo
 						&& null != indexVo.getNewSiteCnt()
 						&& StringUtils.isNotBlank(indexVo.getTime())
 						&& indexVo.getTime().indexOf(month) >= 0) {
@@ -455,8 +455,8 @@ public class IndexMgrController extends BaseApiController {
 		}
 		return 0;
 	}
-	
-	
+
+
 	/**
 	 * 查询统计交易金额
 	 * @return
@@ -464,12 +464,12 @@ public class IndexMgrController extends BaseApiController {
 	@PostMapping("/daily")
 	// @PreAuthorize("@ss.hasPermi('business:channel:list')")
 	public AjaxResult listDailyData(@RequestBody IndexQueryParam indeQueryParam) {
-		
+
 		// 今天
 		IndexQueryParam queryParam = new IndexQueryParam();
 		queryParam.setStartTime(DateUtils.getPreDayOfNowZero(0));  // 今天0点
 		queryParam.setEndTime(new Date());  // 今天
-		
+
 		List<IndexVO> todayList = new ArrayList<IndexVO>();
 		List<IndexVO> yestodayList = new ArrayList<IndexVO>();
 		List<IndexVO> todaySiteList = new ArrayList<IndexVO>();
@@ -497,11 +497,11 @@ public class IndexMgrController extends BaseApiController {
 		siteQueryWrapper1.le(null != queryParam && null != queryParam.getEndTime(), "t1.created_time", queryParam.getEndTime());
 		siteQueryWrapper1.eq("t1.`level`", 0);
 		todaySiteList = channelService.selectIndexSiteIncreaseList(siteQueryWrapper1);
-		
+
 		// 昨天
 		queryParam.setStartTime(DateUtils.getPreDayOfNowZero(1));  // 昨天0点
 		queryParam.setEndTime(DateUtils.getPreDayOfNow(1));  // 今天减去24小时
-		
+
 		QueryWrapper<UserTicketOrder> queryWrapper2 = new QueryWrapper<>();
 		queryWrapper2.ge(null != queryParam && null != queryParam.getStartTime(), "t1.created_time", queryParam.getStartTime());
 		queryWrapper2.le(null != queryParam && null != queryParam.getEndTime(), "t1.created_time", queryParam.getEndTime());
@@ -515,14 +515,14 @@ public class IndexMgrController extends BaseApiController {
 		channelOrderQueryWrapper2.gt("t1.type" , 1);
 		channelOrderYestodayList = channelOrderService.selectIndexChannelOrderDailyInfoList(channelOrderQueryWrapper2);
 		yestodayList = addPrePayOrderInfo(yestodayList, channelOrderYestodayList);
-		
+
 
 		QueryWrapper<Channel> siteQueryWrapper2 = new QueryWrapper<>();
 		siteQueryWrapper2.ge(null != queryParam && null != queryParam.getStartTime(), "t1.created_time", queryParam.getStartTime());
 		siteQueryWrapper2.le(null != queryParam && null != queryParam.getEndTime(), "t1.created_time", queryParam.getEndTime());
 		siteQueryWrapper2.eq("t1.`level`", 0);
 		yetodaySiteList = channelService.selectIndexSiteIncreaseList(siteQueryWrapper2);
-		
+
 		return  AjaxResult.success(calcDailyInfoData(todayList, yestodayList, todaySiteList, yetodaySiteList));
 	}
 
@@ -557,20 +557,20 @@ public class IndexMgrController extends BaseApiController {
 		Map<String,Object> ticketNum = new HashMap<String,Object>();
 		Map<String,Object> newSite = new HashMap<String,Object>();
 		String today = DateUtils.parseDateToStr(DateUtils.YYYYMMDD,new Date());
-		
+
 		int todayPayAmt = 0;
 		int todayPayUserCnt = 0;
 		int todayTicketNum = 0;
 		int todayNewSiteCnt = 0;
-		
+
 		int yesterdayPayAmt = 0;
 		int yesterdayPayUserCnt = 0;
 		int yesterdayTicketNum = 0;
 		int yesterdayNewSiteCnt = 0;
-		
+
 		if(null != list && list.size() > 0) {
 			for(IndexVO indexVo : list) {
-				if(null != indexVo 
+				if(null != indexVo
 						&& StringUtils.isNotBlank(indexVo.getTime())) {
 					if(today.equals(indexVo.getTime())) {
 						todayPayAmt =  null != indexVo.getPayAmt()?indexVo.getPayAmt():0;
@@ -586,7 +586,7 @@ public class IndexMgrController extends BaseApiController {
 		}
 		if(null != siteList && siteList.size() > 0) {
 			for(IndexVO indexVo : siteList) {
-				if(null != indexVo 
+				if(null != indexVo
 						&& null != indexVo.getNewSiteCnt()
 						&& StringUtils.isNotBlank(indexVo.getTime())) {
 					if(today.equals(indexVo.getTime())) {
@@ -605,38 +605,38 @@ public class IndexMgrController extends BaseApiController {
 		ticketNum.put("yesterday", yesterdayTicketNum);
 		newSite.put("today", todayNewSiteCnt);
 		newSite.put("yesterday", yesterdayNewSiteCnt);
-		
+
 		Map<String,Object> map = new HashMap<String,Object>();
 		map.put("payAmt", payAmt);
 		map.put("payUser", payUser);
 		map.put("ticketNum", ticketNum);
 		map.put("newSite", newSite);
 		return map;
-	} 
-	
-	
+	}
+
+
 	@SuppressWarnings("unused")
 	private Map<String,Object> calcDailyInfoData(List<IndexVO> todayList, List<IndexVO> yetodayList,  List<IndexVO> todaySiteList, List<IndexVO> yetodaySiteList){
 		Map<String,Object> payAmt = new HashMap<String,Object>();
 		Map<String,Object> payUser = new HashMap<String,Object>();
 		Map<String,Object> ticketNum = new HashMap<String,Object>();
 		Map<String,Object> newSite = new HashMap<String,Object>();
-		
+
 		String today = DateUtils.parseDateToStr(DateUtils.YYYYMMDD,new Date());
-		
+
 		int todayPayAmt = 0;
 		int todayPayUserCnt = 0;
 		int todayTicketNum = 0;
 		int todayNewSiteCnt = 0;
-		
+
 		int yesterdayPayAmt = 0;
 		int yesterdayPayUserCnt = 0;
 		int yesterdayTicketNum = 0;
 		int yesterdayNewSiteCnt = 0;
-		
+
 		if(null != todayList && todayList.size() > 0) {
 			for(IndexVO indexVo : todayList) {
-				if(null != indexVo 
+				if(null != indexVo
 						&& StringUtils.isNotBlank(indexVo.getTime())) {
 					todayPayAmt +=  null != indexVo.getPayAmt()?indexVo.getPayAmt():0;
 					todayPayUserCnt +=  null != indexVo.getPayUserCnt()?indexVo.getPayUserCnt():0;
@@ -644,7 +644,7 @@ public class IndexMgrController extends BaseApiController {
 				}
 			}
 		}
-		
+
 		if(null != yetodayList && yetodayList.size() > 0) {
 			for(IndexVO indexVo : yetodayList) {
 				if(null != indexVo) {
@@ -654,25 +654,25 @@ public class IndexMgrController extends BaseApiController {
 				}
 			}
 		}
-		
+
 		if(null != todaySiteList && todaySiteList.size() > 0) {
 			for(IndexVO indexVo : todaySiteList) {
-				if(null != indexVo 
+				if(null != indexVo
 						&& null != indexVo.getNewSiteCnt()) {
 					todayNewSiteCnt += null != indexVo.getNewSiteCnt()?indexVo.getNewSiteCnt():0;
 				}
 			}
 		}
-		
+
 		if(null != yetodaySiteList && yetodaySiteList.size() > 0) {
 			for(IndexVO indexVo : yetodaySiteList) {
-				if(null != indexVo 
+				if(null != indexVo
 						&& null != indexVo.getNewSiteCnt()) {
 					yesterdayNewSiteCnt += null != indexVo.getNewSiteCnt()?indexVo.getNewSiteCnt():0;
 				}
 			}
 		}
-		
+
 		payAmt.put("today", todayPayAmt);
 		payAmt.put("yesterday", yesterdayPayAmt);
 		payUser.put("today", todayPayUserCnt);
@@ -681,15 +681,15 @@ public class IndexMgrController extends BaseApiController {
 		ticketNum.put("yesterday", yesterdayTicketNum);
 		newSite.put("today", todayNewSiteCnt);
 		newSite.put("yesterday", yesterdayNewSiteCnt);
-		
+
 		Map<String,Object> map = new HashMap<String,Object>();
 		map.put("payAmt", payAmt);
 		map.put("payUser", payUser);
 		map.put("ticketNum", ticketNum);
 		map.put("newSite", newSite);
 		return map;
-	} 
-	
+	}
+
 	/**
 	 * 查询统计统计票组销售TOP10
 	 * @return
@@ -697,21 +697,21 @@ public class IndexMgrController extends BaseApiController {
 	@PostMapping("/ticket/box/top")
 	// @PreAuthorize("@ss.hasPermi('business:channel:list')")
 	public AjaxResult ticketBoxTopData(@RequestBody IndexQueryParam indeQueryParam) {
-		
+
 		IndexQueryParam queryParam = getQueryParam(indeQueryParam);
 		List<IndexVO> list = new ArrayList<IndexVO>();
 //		QueryWrapper<UserTicketOrder> queryWrapper = new QueryWrapper<>();
 //		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()));
-//				
+//
 //			}
 //		}
 
@@ -729,7 +729,7 @@ public class IndexMgrController extends BaseApiController {
 		List<Map<String,Object>> mapList = new ArrayList<>();
 		if(null != list && list.size() > 0) {
 			for(IndexVO indexVo : list) {
-				if(null != indexVo 
+				if(null != indexVo
 						&& StringUtils.isNotBlank(indexVo.getTitle())
 						&& null != indexVo.getPayAmt()) {
 					Map<String,Object> map = new HashMap<String,Object>();
@@ -741,8 +741,8 @@ public class IndexMgrController extends BaseApiController {
 		}
 		return  AjaxResult.success(mapList);
 	}
-	
-	
+
+
 	/**
 	 * 统计经销商交易额TOP10
 	 * @return
@@ -750,29 +750,30 @@ public class IndexMgrController extends BaseApiController {
 	@PostMapping("/ticket/site/top")
 	// @PreAuthorize("@ss.hasPermi('business:channel:list')")
 	public AjaxResult ticketSiteTopData(@RequestBody IndexQueryParam indeQueryParam) {
-		
+
 		IndexQueryParam queryParam = getQueryParam(indeQueryParam);
 		List<IndexVO> list = new ArrayList<IndexVO>();
 		QueryWrapper<UserTicketOrder> queryWrapper = new QueryWrapper<>();
 		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);
-		
+		queryWrapper.isNotNull("t1.channel_id");
+
 //		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<>();
 		if(null != list && list.size() > 0) {
 			for(IndexVO indexVo : list) {
-				if(null != indexVo 
+				if(null != indexVo
 						&& StringUtils.isNotBlank(indexVo.getName())
 						&& null != indexVo.getPayAmt()) {
 					Map<String,Object> map = new HashMap<String,Object>();

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

@@ -216,12 +216,12 @@ public class UserTicketOrderMgrController extends BaseApiController {
             queryWrapper.eq("t2.status", userTicketOrderQueryParam.getStatus());
         }
         if (Objects.nonNull(userTicketOrderQueryParam.getStartTime()) && Objects.nonNull(userTicketOrderQueryParam.getEndTime())) {
-            queryWrapper.between("t2.created_time", userTicketOrderQueryParam.getStartTime(), userTicketOrderQueryParam.getEndTime());
+            queryWrapper.between("t1.created_time", userTicketOrderQueryParam.getStartTime(), userTicketOrderQueryParam.getEndTime());
         }
         if (Objects.nonNull(userTicketOrderQueryParam.getChannelId()) && userTicketOrderQueryParam.getChannelId() != 0) {
             queryWrapper.eq("t2.channel_id", userTicketOrderQueryParam.getChannelId());
         }
-        queryWrapper.orderByDesc("t2.created_time");
+        queryWrapper.orderByDesc("t1.created_time");
 
         int totalSize = userTicketOrderItemService.countUserTicketOrderItem(queryWrapper);
         if (totalSize == 0) {