|
|
@@ -364,7 +364,7 @@ public class StatisticsDataServiceImpl implements StatisticsDataService {
|
|
|
//Ai A中第二单 为任意产品
|
|
|
Integer monthAiNewPayOtherNumOfUser = statisticsExportMapper.getMonthAiNewPayOtherNumOfUser(thisMonth, nextMonth);
|
|
|
//Ai A中第二单 为流媒体
|
|
|
- Integer monthAiNewPayStreamingNumOfUser = statisticsExportMapper.getMonthAiNewPayStreamingNumOfUser(thisMonth,nextMonth);
|
|
|
+ Integer monthAiNewPayStreamingNumOfUser = statisticsExportMapper.getMonthAiNewPayStreamingNumOfUser(thisMonth, nextMonth);
|
|
|
|
|
|
// //历史复购 AI、奈飞车票人数 以及交叉
|
|
|
// Integer nfTicketNumOfUser = statisticsExportMapper.getNfTicketNumOfUser(1l);
|
|
|
@@ -448,9 +448,9 @@ public class StatisticsDataServiceImpl implements StatisticsDataService {
|
|
|
|
|
|
//下单率
|
|
|
//自然渠道用户数
|
|
|
- Integer natureUserSourceNum = statisticsExportMapper.getMonthUserSourceNumByType(1,startDate,endDate);
|
|
|
+ Integer natureUserSourceNum = statisticsExportMapper.getMonthUserSourceNumByType(1, startDate, endDate);
|
|
|
//自然渠道下单人数
|
|
|
- Integer natureUserSourceOrderNum = statisticsExportMapper.getMonthUserSourceNumOrderByType(1,startDate,endDate);
|
|
|
+ Integer natureUserSourceOrderNum = statisticsExportMapper.getMonthUserSourceNumOrderByType(1, startDate, endDate);
|
|
|
String natureUserSourceOrderRate;
|
|
|
if (natureUserSourceNum == 0) {
|
|
|
natureUserSourceOrderRate = StrUtil.EMPTY;
|
|
|
@@ -459,7 +459,7 @@ public class StatisticsDataServiceImpl implements StatisticsDataService {
|
|
|
}
|
|
|
//分销渠道用户数
|
|
|
Integer channelUserSourceNum = statisticsExportMapper.getMonthUserSourceNumByType(2, startDate, endDate);
|
|
|
- Integer channelUserSourceOrderNum = statisticsExportMapper.getMonthUserSourceNumOrderByType(2,startDate,endDate);
|
|
|
+ Integer channelUserSourceOrderNum = statisticsExportMapper.getMonthUserSourceNumOrderByType(2, startDate, endDate);
|
|
|
String channelUserSourceOrderRate = BigDecimal.valueOf(channelUserSourceOrderNum).divide(BigDecimal.valueOf(channelUserSourceNum), 2, RoundingMode.HALF_DOWN).multiply(BigDecimal.valueOf(100)) + "%";
|
|
|
|
|
|
excelMonthlyDistributeOrderData.setNatureUserSourceNum(natureUserSourceNum);
|
|
|
@@ -638,7 +638,6 @@ public class StatisticsDataServiceImpl implements StatisticsDataService {
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
private void getAppleOneDataView(BackgroundDataView backgroundDataView, Date startDate, Date endDate) {
|
|
|
if (DateUtil.beginOfDay(DateTime.now()).equals(startDate) && (DateUtil.beginOfDay(DateUtil.offsetDay(DateTime.now(), 1)).equals(endDate) || DateUtil.endOfDay(DateTime.now()).equals(endDate))) {
|
|
|
List<AppleOneData> appleOneData1 = statistics.statisticsAppleOneData(startDate, endDate, true);
|