Merge branch 'dev' into 'mp-server-test'

Dev

See merge request quanshu/mp-server!396

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

@@ -450,41 +450,46 @@ public class IndexMgrController extends BaseApiController {
 	// @PreAuthorize("@ss.hasPermi('business:channel:list')")
 	public AjaxResult listDailyData(@RequestBody IndexQueryParam indeQueryParam) {
 		
+		// 今天
 		IndexQueryParam queryParam = new IndexQueryParam();
-		queryParam.setStartTime(DateUtils.getPreDayOfNowZero(1));  // 昨天
+		queryParam.setStartTime(DateUtils.getPreDayOfNow(1));  // 今天减去24小时
 		queryParam.setEndTime(new Date());  // 今天
 		
-		List<IndexVO> list = new ArrayList<IndexVO>();
-		List<IndexVO> siteList = new ArrayList<IndexVO>();
+		List<IndexVO> todayList = new ArrayList<IndexVO>();
+		List<IndexVO> yestodayList = new ArrayList<IndexVO>();
+		List<IndexVO> todaySiteList = new ArrayList<IndexVO>();
+		List<IndexVO> yetodaySiteList = 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<UserTicketOrder> queryWrapper1 = new QueryWrapper<>();
+		queryWrapper1.ge(null != queryParam && null != queryParam.getStartTime(), "t1.created_time", queryParam.getStartTime());
+		queryWrapper1.le(null != queryParam && null != queryParam.getEndTime(), "t1.created_time", queryParam.getEndTime());
+		queryWrapper1.gt("t1.`status`", 0);
+		todayList = userTicketOrderService.selectIndexDailyInfoList(queryWrapper1);
 		
-
-		QueryWrapper<Channel> siteQueryWrapper = new QueryWrapper<>();
-		siteQueryWrapper.ge(null != queryParam && null != queryParam.getStartTime(), "t1.created_time", queryParam.getStartTime());
-		siteQueryWrapper.le(null != queryParam && null != queryParam.getEndTime(), "t1.created_time", queryParam.getEndTime());
-		siteQueryWrapper.eq("t1.`level`", 0);
+		QueryWrapper<Channel> siteQueryWrapper1 = new QueryWrapper<>();
+		siteQueryWrapper1.ge(null != queryParam && null != queryParam.getStartTime(), "t1.created_time", queryParam.getStartTime());
+		siteQueryWrapper1.le(null != queryParam && null != queryParam.getEndTime(), "t1.created_time", queryParam.getEndTime());
+		siteQueryWrapper1.eq("t1.`level`", 0);
+		todaySiteList = channelService.selectIndexSiteIncreaseList(siteQueryWrapper1);
 		
-//		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);
-	
-		siteList = channelService.selectIndexSiteIncreaseList(siteQueryWrapper);
+		// 昨天
+		queryParam.setStartTime(DateUtils.getPreDayOfNow(2));  // 今天减去48小时
+		queryParam.setEndTime(DateUtils.getPreDayOfNow(1));  // 今天减去48小时
+		
+		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());
+		queryWrapper2.gt("t1.`status`", 0);
+		yestodayList = userTicketOrderService.selectIndexDailyInfoList(queryWrapper2);
 		
-		return  AjaxResult.success(getDailyInfoData(list, siteList));
+
+		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));
 	}
 	
 	
@@ -551,6 +556,82 @@ public class IndexMgrController extends BaseApiController {
 		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 
+						&& StringUtils.isNotBlank(indexVo.getTime())) {
+					todayPayAmt +=  null != indexVo.getPayAmt()?indexVo.getPayAmt():0;
+					todayPayUserCnt +=  null != indexVo.getPayUserCnt()?indexVo.getPayUserCnt():0;
+					todayTicketNum += null != indexVo.getTicketNum()?indexVo.getTicketNum():0;
+				}
+			}
+		}
+		
+		if(null != yetodayList && yetodayList.size() > 0) {
+			for(IndexVO indexVo : yetodayList) {
+				if(null != indexVo) {
+					yesterdayPayAmt += null != indexVo.getPayAmt()?indexVo.getPayAmt():0;
+					yesterdayPayUserCnt += null != indexVo.getPayUserCnt()?indexVo.getPayUserCnt():0;
+					yesterdayTicketNum +=  null != indexVo.getTicketNum()?indexVo.getTicketNum():0;
+				}
+			}
+		}
+		
+		if(null != todaySiteList && todaySiteList.size() > 0) {
+			for(IndexVO indexVo : todaySiteList) {
+				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 
+						&& null != indexVo.getNewSiteCnt()) {
+					yesterdayNewSiteCnt += null != indexVo.getNewSiteCnt()?indexVo.getNewSiteCnt():0;
+				}
+			}
+		}
+		
+		payAmt.put("today", todayPayAmt);
+		payAmt.put("yesterday", yesterdayPayAmt);
+		payUser.put("today", todayPayUserCnt);
+		payUser.put("yesterday", yesterdayPayUserCnt);
+		ticketNum.put("today", todayTicketNum);
+		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

mp-common/src/main/java/com/qs/mp/common/utils/MD5.java

@@ -1,6 +1,7 @@
 package com.qs.mp.common.utils;
 
 import java.security.MessageDigest;
+import java.util.Iterator;
 /** 
  * 说明：MD5处理
  * 创建人：FH Q313596790