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

Dev

See merge request quanshu/mp-server!397

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

@@ -452,7 +452,7 @@ public class IndexMgrController extends BaseApiController {
 		
 		// 今天
 		IndexQueryParam queryParam = new IndexQueryParam();
-		queryParam.setStartTime(DateUtils.getPreDayOfNow(1));  // 今天减去24小时
+		queryParam.setStartTime(DateUtils.getPreDayOfNowZero(0));  // 今天0点
 		queryParam.setEndTime(new Date());  // 今天
 		
 		List<IndexVO> todayList = new ArrayList<IndexVO>();
@@ -473,8 +473,8 @@ public class IndexMgrController extends BaseApiController {
 		todaySiteList = channelService.selectIndexSiteIncreaseList(siteQueryWrapper1);
 		
 		// 昨天
-		queryParam.setStartTime(DateUtils.getPreDayOfNow(2));  // 今天减去48小时
-		queryParam.setEndTime(DateUtils.getPreDayOfNow(1));  // 今天减去48小时
+		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());

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

@@ -54,7 +54,7 @@
 		select 
           DATE_FORMAT(t1.created_time, '%Y%m%d') AS time,
           SUM(t1.pay_amt) AS payAmt,
-          SUM(IFNULL(t1.ticket_num,0)) AS 'ticketNum',
+          SUM(IFNULL(t1.ticket_num,0)) AS ticketNum,
           COUNT(DISTINCT t1.user_id) AS payUserCnt
 	     from `mp_user_ticket_order` t1
 		${ew.customSqlSegment}