首页交易金额，交易用户数，新增经销商数 粒度统计查询接口

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

@@ -12,9 +12,14 @@ import com.qs.mp.user.service.IUserTicketOrderService;
 import com.qs.mp.utils.SecurityUtils;
 import com.qs.mp.web.controller.common.BaseApiController;
 import io.swagger.annotations.Api;
+
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -48,7 +53,7 @@ public class IndexMgrController extends BaseApiController {
 	 */
 	@PostMapping("/pay/amt")
 	// @PreAuthorize("@ss.hasPermi('business:channel:list')")
-	public AjaxResult listChannel(@RequestBody IndexQueryParam indeQueryParam) {
+	public AjaxResult listPayAmtData(@RequestBody IndexQueryParam indeQueryParam) {
 		
 		IndexQueryParam queryParam = getQueryParam(indeQueryParam);
 		
@@ -67,9 +72,227 @@ public class IndexMgrController extends BaseApiController {
 		}
 	
 		list = userTicketOrderService.selectIndexPayAmtList(queryWrapper);
-		return  AjaxResult.success(list);
+		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")) {  // 月粒度
+			List<String> monthList = DateUtils.addMonths(queryParam.getStartTime(), queryParam.getEndTime());
+			if(null != monthList && monthList.size() > 0) {
+				for(String month : monthList) {
+					if(StringUtils.isNotBlank(month)) {
+						Map<String,Object> map = new HashMap<String,Object>();
+						map.put("x", month);
+						map.put("y", getMonthPayAmt(month, list));
+						mapList.add(map);
+					}
+				}
+			}
+		}else if(null != queryParam && queryParam.getLevel().equals("week")) {  // 周粒度
+			List<Map<String,Object>> weekList = DateUtils.getDateOfWeek(queryParam.getStartTime(), queryParam.getEndTime());
+			if(null != weekList && weekList.size() > 0) {
+				for(Map<String,Object> weekMap : weekList) {
+					if(null != weekMap && weekMap.containsKey("start")
+							&& weekMap.containsKey("end")
+							&& weekMap.containsKey("dayList")) {
+						String start = weekMap.get("start").toString();
+						String end = weekMap.get("end").toString();
+						List<String> dayList = (List<String>) weekMap.get("dayList");
+						Map<String,Object> map = new HashMap<String,Object>();
+						map.put("x", start +"-"+end);
+						map.put("y", getWeekPayAmt(dayList, list));
+						mapList.add(map);
+					}
+				}
+			}
+		}else {  // 日粒度
+			List<String> dayList = DateUtils.addDates(DateUtils.dateTime(queryParam.getStartTime()), DateUtils.dateTime(queryParam.getEndTime()));
+			if(null != dayList && dayList.size() > 0) {
+				for(String day : dayList) {
+					int payAmt = 0;
+					if(null != list && list.size() > 0) {
+						if(StringUtils.isNotBlank(day)) {
+							for(IndexVO indexVo : list) {
+								if(null != indexVo 
+										&& null != indexVo.getPayAmt()
+										&& StringUtils.isNotBlank(indexVo.getTime())
+										&& indexVo.getTime().equals(day)) {
+									payAmt = indexVo.getPayAmt();
+									break;
+								}
+							}
+						}
+					}
+					Map<String,Object> map = new HashMap<String,Object>();
+					map.put("x", day);
+					map.put("y", payAmt);
+					mapList.add(map);
+				}
+			}
+		}
+		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 
+						&& null != indexVo.getPayAmt()
+						&& StringUtils.isNotBlank(indexVo.getTime())
+						&& dayList.contains(indexVo.getTime())) {
+					payAmt = payAmt.add(new BigDecimal(indexVo.getPayAmt()));
+				}
+			}
+			return payAmt.intValue();
+		}
+		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 
+						&& null != indexVo.getPayAmt()
+						&& StringUtils.isNotBlank(indexVo.getTime())
+						&& indexVo.getTime().indexOf(month) >= 0) {
+					payAmt = payAmt.add(new BigDecimal(indexVo.getPayAmt()));
+				}
+			}
+			return payAmt.intValue();
+		}
+		return 0;
+	}
+	
+	
+	/**
+	 * 查询统计交易用户数
+	 * @return
+	 */
+	@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<UserDeliverOrder> queryWrapper = new QueryWrapper<>();
+		queryWrapper.ge(null != queryParam && null != queryParam.getStartTime(), "DATE_FORMAT(t1.created_time, '%Y-%m-%d')", queryParam.getStartTime());
+		queryWrapper.le(null != queryParam && null != queryParam.getEndTime(), "DATE_FORMAT(t1.created_time, '%Y-%m-%d')", 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()));
+			}
+		}
+	
+		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")) {  // 月粒度
+			List<String> monthList = DateUtils.addMonths(queryParam.getStartTime(), queryParam.getEndTime());
+			if(null != monthList && monthList.size() > 0) {
+				for(String month : monthList) {
+					if(StringUtils.isNotBlank(month)) {
+						Map<String,Object> map = new HashMap<String,Object>();
+						map.put("x", month);
+						map.put("y", getMonthPayUser(month, list));
+						mapList.add(map);
+					}
+				}
+			}
+		}else if(null != queryParam && queryParam.getLevel().equals("week")) {  // 周粒度
+			List<Map<String,Object>> weekList = DateUtils.getDateOfWeek(queryParam.getStartTime(), queryParam.getEndTime());
+			if(null != weekList && weekList.size() > 0) {
+				for(Map<String,Object> weekMap : weekList) {
+					if(null != weekMap && weekMap.containsKey("start")
+							&& weekMap.containsKey("end")
+							&& weekMap.containsKey("dayList")) {
+						String start = weekMap.get("start").toString();
+						String end = weekMap.get("end").toString();
+						List<String> dayList = (List<String>) weekMap.get("dayList");
+						Map<String,Object> map = new HashMap<String,Object>();
+						map.put("x", start +"-"+end);
+						map.put("y", getWeekPayUser(dayList, list));
+						mapList.add(map);
+					}
+				}
+			}
+		}else {  // 日粒度
+			List<String> dayList = DateUtils.addDates(DateUtils.dateTime(queryParam.getStartTime()), DateUtils.dateTime(queryParam.getEndTime()));
+			if(null != dayList && dayList.size() > 0) {
+				for(String day : dayList) {
+					int payUser = 0;
+					if(null != list && list.size() > 0) {
+						if(StringUtils.isNotBlank(day)) {
+							for(IndexVO indexVo : list) {
+								if(null != indexVo 
+										&& null != indexVo.getPayUserCnt()
+										&& StringUtils.isNotBlank(indexVo.getTime())
+										&& indexVo.getTime().equals(day)) {
+									payUser = indexVo.getPayUserCnt();
+									break;
+								}
+							}
+						}
+					}
+					Map<String,Object> map = new HashMap<String,Object>();
+					map.put("x", day);
+					map.put("y", payUser);
+					mapList.add(map);
+				}
+			}
+		}
+		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 
+						&& null != indexVo.getPayUserCnt()
+						&& StringUtils.isNotBlank(indexVo.getTime())
+						&& dayList.contains(indexVo.getTime())) {
+					payUserCnt = payUserCnt + indexVo.getPayUserCnt();
+				}
+			}
+			return payUserCnt;
+		}
+		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 
+						&& null != indexVo.getPayUserCnt()
+						&& StringUtils.isNotBlank(indexVo.getTime())
+						&& indexVo.getTime().indexOf(month) >= 0) {
+					payUserCnt = payUserCnt + indexVo.getPayUserCnt();
+				}
+			}
+			return payUserCnt;
+		}
+		return 0;
+	}
+	
+	
 	/**
 	 * 初始化查询参数
 	 * @param indeQueryParam
@@ -80,12 +303,145 @@ public class IndexMgrController extends BaseApiController {
 		queryParam.setDays(null != indeQueryParam && null != indeQueryParam.getDays()?indeQueryParam.getDays():7);
 		queryParam.setLevel(null != indeQueryParam && StringUtils.isNotBlank(indeQueryParam.getLevel())?indeQueryParam.getLevel():"day");
 		if(queryParam.getDays() == 0) { // 自定义
-			
+			if(null != indeQueryParam.getStartTime() && null != indeQueryParam.getEndTime()) {
+				queryParam.setStartTime(indeQueryParam.getStartTime());
+				queryParam.setEndTime(indeQueryParam.getEndTime());
+			}else {
+				queryParam.setStartTime(DateUtils.getPreDayOfNow(7));
+				queryParam.setEndTime(new Date());
+			}
 		}else {
-			queryParam.setStartTime(new Date());
-			queryParam.setEndTime(DateUtils.getNowDate());
+			queryParam.setStartTime(DateUtils.getPreDayOfNow(queryParam.getDays()));
+			queryParam.setEndTime(new Date());
 		}
 		return queryParam;
 	}
+	
+	
+	/**
+	 * 查询统计新增经销商数量
+	 * @return
+	 */
+	@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(), "DATE_FORMAT(t1.created_time, '%Y-%m-%d')", queryParam.getStartTime());
+		queryWrapper.le(null != queryParam && null != queryParam.getEndTime(), "DATE_FORMAT(t1.created_time, '%Y-%m-%d')", 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()));
+			}
+		}
+	
+		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")) {  // 月粒度
+			List<String> monthList = DateUtils.addMonths(queryParam.getStartTime(), queryParam.getEndTime());
+			if(null != monthList && monthList.size() > 0) {
+				for(String month : monthList) {
+					if(StringUtils.isNotBlank(month)) {
+						Map<String,Object> map = new HashMap<String,Object>();
+						map.put("x", month);
+						map.put("y", getMonthSiteIncrease(month, list));
+						mapList.add(map);
+					}
+				}
+			}
+		}else if(null != queryParam && queryParam.getLevel().equals("week")) {  // 周粒度
+			List<Map<String,Object>> weekList = DateUtils.getDateOfWeek(queryParam.getStartTime(), queryParam.getEndTime());
+			if(null != weekList && weekList.size() > 0) {
+				for(Map<String,Object> weekMap : weekList) {
+					if(null != weekMap && weekMap.containsKey("start")
+							&& weekMap.containsKey("end")
+							&& weekMap.containsKey("dayList")) {
+						String start = weekMap.get("start").toString();
+						String end = weekMap.get("end").toString();
+						List<String> dayList = (List<String>) weekMap.get("dayList");
+						Map<String,Object> map = new HashMap<String,Object>();
+						map.put("x", start +"-"+end);
+						map.put("y", getWeekSiteIncrease(dayList, list));
+						mapList.add(map);
+					}
+				}
+			}
+		}else {  // 日粒度
+			List<String> dayList = DateUtils.addDates(DateUtils.dateTime(queryParam.getStartTime()), DateUtils.dateTime(queryParam.getEndTime()));
+			if(null != dayList && dayList.size() > 0) {
+				for(String day : dayList) {
+					int newSiteCnt = 0;
+					if(null != list && list.size() > 0) {
+						if(StringUtils.isNotBlank(day)) {
+							for(IndexVO indexVo : list) {
+								if(null != indexVo 
+										&& null != indexVo.getNewSiteCnt()
+										&& StringUtils.isNotBlank(indexVo.getTime())
+										&& indexVo.getTime().equals(day)) {
+									newSiteCnt = indexVo.getNewSiteCnt();
+									break;
+								}
+							}
+						}
+					}
+					
+					Map<String,Object> map = new HashMap<String,Object>();
+					map.put("x", day);
+					map.put("y", newSiteCnt);
+					mapList.add(map);
+				}
+			}
+		}
+		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 
+						&& null != indexVo.getNewSiteCnt()
+						&& StringUtils.isNotBlank(indexVo.getTime())
+						&& dayList.contains(indexVo.getTime())) {
+					newSiteCnt = newSiteCnt + indexVo.getNewSiteCnt();
+				}
+			}
+			return newSiteCnt;
+		}
+		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 
+						&& null != indexVo.getNewSiteCnt()
+						&& StringUtils.isNotBlank(indexVo.getTime())
+						&& indexVo.getTime().indexOf(month) >= 0) {
+					newSiteCnt = newSiteCnt + indexVo.getNewSiteCnt();
+				}
+			}
+			return newSiteCnt;
+		}
+		return 0;
+	}
+	
+	
+
 
 }

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

@@ -246,6 +246,23 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     }
     
     // 首页统计日期处理
+    
+    
+  	 /** 
+  	 * 取得指定日期所在周的最后一天 
+  	 */ 
+  	 public static Date getPreDayOfNow(int days) { 
+  		try {
+			Calendar c = Calendar.getInstance();
+		   	c.setFirstDayOfWeek(Calendar.MONDAY); 
+		   	c.add(Calendar.DATE, - days);
+		   	return c.getTime(); 
+		} catch (Exception e) {
+			e.printStackTrace();
+			return null;
+		}
+  	 }
+    
     /** 
      * @Title: getDateOfWeek 
      * @Description: 获取两个时间内所有周之间的时间段，并且获得是今年第几周
@@ -255,7 +272,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     public static List<Map<String,Object>> getDateOfWeek(Date startTime, Date endTime) {
     	List<Map<String,Object>> rtnList = new ArrayList<Map<String,Object>>();
     	try {  
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");  
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");  
             
             Calendar startCalendar = Calendar.getInstance();  
             startCalendar.setTime(startTime);  
@@ -302,7 +319,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
                 Long time = startTIme;
                 //循环得出
                 while (time <= endTIme) {
-                    list.add(new SimpleDateFormat("yyyy-MM-dd").format(new Date(time)));
+                    list.add(new SimpleDateFormat("yyyyMMdd").format(new Date(time)));
                     time += oneDay;
                 }
                 endCalendar.add(Calendar.DATE, -j); //减去增加的日期  
@@ -318,12 +335,11 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
 	 	            	e_date = sdf.format(endTime);
 	 	            }
 	            	 Calendar yearCalendar = Calendar.getInstance();  
-	            	 Date sDate = sdf.parse(s_date);
-	            	 yearCalendar.setTime(sDate);  
+	            	 yearCalendar.setTime(startTime);  
 	            	int year = yearCalendar.get(Calendar.YEAR);  
 	            	String s = year+ "年的第" + (endWeekOfYear - i) + "周" + "(" + s_date + "至" + e_date + ")";     
 	                System.out.println(s);  
-	                System.out.println("包含的日期 = " +list.toString());
+	               // System.out.println("包含的日期 = " +list.toString());
 	                Map<String,Object> map = new HashMap<String,Object>();
 	                map.put("start", s_date);
 	                map.put("end", e_date);
@@ -342,13 +358,12 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     }
     
     
-    
     /** 
    	 * 取得指定日期所在周的第一天 
    	 */ 
    	 public static String getFirstDayOfWeek(Date date) { 
 		try {
-			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
 			Calendar c = new GregorianCalendar(); 
 		   	c.setFirstDayOfWeek(Calendar.MONDAY); 
 		   	c.setTime(date); 
@@ -367,7 +382,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
    	 */ 
    	 public static String getLastDayOfWeek(Date date) { 
    		try {
-			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
 			Calendar c = new GregorianCalendar(); 
 		   	c.setFirstDayOfWeek(Calendar.MONDAY); 
 		   	c.setTime(date); 
@@ -388,7 +403,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
  	 */
   	public static boolean compareDate(String startDate, String endDate) {
  		try {
- 			DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ 			DateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
  			java.util.Date date1 = dateFormat.parse(startDate);
  			java.util.Date date2 = dateFormat.parse(endDate);
  			if (date1.getTime() > date2.getTime())
@@ -424,23 +439,98 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
         Long time = startTIme;
         //循环得出
         while (time <= endTime) {
-            list.add(new SimpleDateFormat("yyyy-MM-dd").format(new Date(time)));
+            list.add(new SimpleDateFormat("yyyyMMdd").format(new Date(time)));
             time += oneDay;
         }
         return list;
     }
     
     
+    /** 
+     * @Title: getDateOfWeek 
+     * @Description: 获取两个时间内所有周之间的时间段，并且获得是今年第几周
+     * @param start_time    开始时间 
+     * @param end_time      结束时间 
+     */  
+    public static List<String> addMonths(Date startTime, Date endTime) {
+    	List<String> list = new ArrayList<String>();
+    	try {  
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(startTime);
+            // 获取开始年份和开始月份
+            int startYear = calendar.get(Calendar.YEAR);
+            int startMonth = calendar.get(Calendar.MONTH);
+            // 获取结束年份和结束月份
+            calendar.setTime(endTime);
+            int endYear = calendar.get(Calendar.YEAR);
+            int endMonth = calendar.get(Calendar.MONTH);
+            //
+            
+            for (int i = startYear; i <= endYear; i++) {
+                String date = "";
+                if (startYear == endYear) {
+                    for (int j = startMonth; j <= endMonth; j++) {
+                        if (j < 9) {
+                            date = i + "0" + (j + 1);
+                        } else {
+                            date = i + "" + (j + 1);
+                        }
+                        list.add(date);
+                    }
+                } else {
+                    if (i == startYear) {
+                        for (int j = startMonth; j < 12; j++) {
+                            if (j < 9) {
+                                date = i + "0" + (j + 1);
+                            } else {
+                                date = i + "" + (j + 1);
+                            }
+                            list.add(date);
+                        }
+                    } else if (i == endYear) {
+                        for (int j = 0; j <= endMonth; j++) {
+                            if (j < 9) {
+                                date = i + "0" + (j + 1);
+                            } else {
+                                date = i + "" + (j + 1);
+                            }
+                            list.add(date);
+                        }
+                    } else {
+                        for (int j = 0; j < 12; j++) {
+                            if (j < 9) {
+                                date = i + "0" + (j + 1);
+                            } else {
+                                date = i + "" + (j + 1);
+                            }
+                            list.add(date);
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {  
+            e.printStackTrace();  
+        }
+    	return list;
+    }
+    
+    
     public static void main(String[] args) throws Exception {
 //      List<String> list = addDates("2022-02-01", "2022-03-31");
 //      list.forEach(i ->
 //              System.out.println(i)
 //      );
-    	DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
-        String start_time = "2022-02-02";
-		String end_time = "2022-04-11";
-		List<Map<String,Object>> lsit = getDateOfWeek(dateFormat.parse(start_time), dateFormat.parse(end_time));  
-		System.out.println(JSON.toJSONString(lsit));
-
+//    	DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+//        String start_time = "2022-02-01";
+//		String end_time = "2022-05-30";
+//		List<Map<String,Object>> lsit = getDateOfWeek(dateFormat.parse(start_time), dateFormat.parse(end_time));  
+//		System.out.println(JSON.toJSONString(lsit));
+		
+		
+//		List<String> monthList = addMonths(dateFormat.parse(start_time), dateFormat.parse(end_time));
+//		System.out.println(JSON.toJSONString(monthList));
+//       
+//		
+//		System.out.println(start_time.indexOf("2022-01"));
   }
 }

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

@@ -68,8 +68,8 @@
 	<!-- 统计新增经销商数列表 -->
     <select id="selectIndexSiteIncreaseList" resultType="com.qs.mp.admin.domain.vo.IndexVO">
 		select 
-          DATE_FORMAT(t1.created_time, '%Y-%m-%d') AS time,
-          COUNT(t1.channel_id) AS newSiteCnt,
+          DATE_FORMAT(t1.created_time, '%Y%m%d') AS time,
+          COUNT(t1.channel_id) AS newSiteCnt
 	     from `mp_channel` t1
 	left join mp_channel t2 on t1.channel_id = t2.channel_id
 		${ew.customSqlSegment}

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

@@ -32,10 +32,10 @@
     <!-- 统计交易金额列表 -->
     <select id="selectIndexPayAmtList" resultType="com.qs.mp.admin.domain.vo.IndexVO">
 		select 
-          DATE_FORMAT(a.created_time, '%Y-%m-%d') AS time,
-          SUM(a.pay_amt) AS payAmt,
-	     from `mp_user_ticket_order` a
-	left join mp_channel b on a.channel_id = b.channel_id
+          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>
@@ -43,10 +43,10 @@
 	 <!-- 统计交易用户数列表 -->
     <select id="selectIndexPayUserCntList" resultType="com.qs.mp.admin.domain.vo.IndexVO">
 		select 
-          DATE_FORMAT(a.created_time, '%Y-%m-%d') AS time,
-          COUNT(DISTINCT a.user_id) AS payUserCnt,
-	     from `mp_user_ticket_order` a
-	left join mp_channel b on a.channel_id = b.channel_id
+          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>